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

fix

git-svn-id: http://svn.net-core.org/repos/t-engine4@3805 51575b47-30f0-44d4-a5cc-537603b46e54
parent 2e7de77b
No related branches found
No related tags found
No related merge requests found
......@@ -45,8 +45,6 @@ newBirthDescriptor{
},
talents = {},
copy = {
moddable_tile = "human_#sex#",
moddable_tile_base = "base_cornac_01.png",
faction = "allied-kingdoms",
type = "humanoid", subtype="human",
resolvers.inscription("INFUSION:_REGENERATION", {cooldown=10, dur=5, heal=60}),
......@@ -106,6 +104,8 @@ newBirthDescriptor
},
experience = 1.0,
copy = {
moddable_tile = "human_#sex#",
moddable_tile_base = "base_cornac_01.png",
unused_talents_types = 1,
life_rating = 10,
default_wilderness = {"playerpop", "allied"},
......
......@@ -766,10 +766,10 @@ end
function _M:setTile(f, w, h)
self.actor:removeAllMOs()
if not f then
if not self.actor.has_custom_tile and self.descriptors_by_type.subrace and self.descriptors_by_type.sex then
local dr = self.birth_descriptor_def.subrace[self.descriptors_by_type.subrace]
local ds = self.birth_descriptor_def.sex[self.descriptors_by_type.sex]
self.actor.image = "player/"..self.descriptors_by_type.subrace:lower():gsub("[^a-z0-9_]", "_").."_"..self.descriptors_by_type.sex:lower():gsub("[^a-z0-9_]", "_")..".png"
if not self.actor.has_custom_tile then
local dr = self.birth_descriptor_def.subrace[self.descriptors_by_type.subrace or "Cornac"]
local ds = self.birth_descriptor_def.sex[self.descriptors_by_type.sex or "Female"]
self.actor.image = "player/"..(self.descriptors_by_type.subrace or "Cornac"):lower():gsub("[^a-z0-9_]", "_").."_"..(self.descriptors_by_type.sex or "Female"):lower():gsub("[^a-z0-9_]", "_")..".png"
self.actor.add_mos = nil
self.actor.female = ds.copy.female
self.actor.male = ds.copy.male
......
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