EGOS !

git-svn-id: http://svn.net-core.org/repos/t-engine4@139 51575b47-30f0-44d4-a5cc-537603b46e54

@@ -5,7 +5,7 @@ local Faction = require "engine.Faction"
 
 module(..., package.seeall, class.inherit(Entity))
 
-function _M:init(t)
+function _M:init(t, no_default)
 	t = t or {}
 
 	self.name = t.name or "unknown actor"
@@ -16,7 +16,7 @@ function _M:init(t)
 	self.energy.mod = self.energy.mod or 0
 	self.faction = t.faction or "enemies"
 	self.changed = true
-	Entity.init(self, t)
+	Entity.init(self, t, no_default)
 
 	self.compute_vals = {}
 end

@@ -11,14 +11,16 @@ setmetatable(__uids, {__mode="v"})
 
 local function copy_recurs(dst, src, deep)
 	for k, e in pairs(src) do
-		if not dst[k] then
+		if type(e) == "table" and e.__CLASSNAME then
+			dst[k] = e
+		elseif not dst[k] then
 			if deep then
 				dst[k] = {}
 				copy_recurs(dst[k], e, deep)
 			else
 				dst[k] = e
 			end
-		elseif type(dst[k]) == "table" and type(e) == "table" then
+		elseif type(dst[k]) == "table" and type(e) == "table" and not e.__CLASSNAME then
 			copy_recurs(dst[k], e, deep)
 		end
 	end
@@ -28,7 +30,7 @@ end
 -- Any subclass MUST call this constructor
 -- @param t a table defining the basic properties of the entity
 -- @usage Entity.new{display='#', color_r=255, color_g=255, color_b=255}
-function _M:init(t)
+function _M:init(t, no_default)
 	t = t or {}
 	self.uid = next_uid
 	__uids[self.uid] = self
@@ -39,23 +41,25 @@ function _M:init(t)
 		self[k] = ee
 	end
 
-	self.image = self.image or nil
-	self.display = self.display or '.'
-	if self.color then
-		self.color_r = self.color.r
-		self.color_g = self.color.g
-		self.color_b = self.color.b
-		self.color_br = self.color.br
-		self.color_bg = self.color.bg
-		self.color_bb = self.color.bb
-		self.color = nil
+	if not no_default then
+		self.image = self.image or nil
+		self.display = self.display or '.'
+		if self.color then
+			self.color_r = self.color.r
+			self.color_g = self.color.g
+			self.color_b = self.color.b
+			self.color_br = self.color.br
+			self.color_bg = self.color.bg
+			self.color_bb = self.color.bb
+			self.color = nil
+		end
+		self.color_r = self.color_r or 0
+		self.color_g = self.color_g or 0
+		self.color_b = self.color_b or 0
+		self.color_br = self.color_br or -1
+		self.color_bg = self.color_bg or -1
+		self.color_bb = self.color_bb or -1
 	end
-	self.color_r = self.color_r or 0
-	self.color_g = self.color_g or 0
-	self.color_b = self.color_b or 0
-	self.color_br = self.color_br or -1
-	self.color_bg = self.color_bg or -1
-	self.color_bb = self.color_bb or -1
 
 	next_uid = next_uid + 1
 
@@ -121,48 +125,46 @@ function _M:check(prop, ...)
 end
 
 --- Loads a list of entities from a definition file
--- @param ... the files to load from
+-- @param file the file to load from
+-- @param no_default if true then no default values will be assigned
 -- @usage MyEntityClass:loadList("/data/my_entities_def.lua")
-function _M:loadList(...)
+function _M:loadList(file, no_default)
 	local res = {}
 
-	for i, file in ipairs{...} do
-		local f, err = loadfile(file)
-		if err then error(err) end
-
-		setfenv(f, setmetatable({
-			resolvers = resolvers,
-			DamageType = require "engine.DamageType",
-			newEntity = function(t)
-				-- Do we inherit things ?
-				if t.base then
-					for k, e in pairs(res[t.base]) do
-						if not t[k] then
-							t[k] = e
-						elseif type(t[k]) == "table" and type(e) == "table" then
-							copy_recurs(t[k], e)
-						end
+	print("Loading entities file", file)
+	local f, err = loadfile(file)
+	if err then error(err) end
+
+	setfenv(f, setmetatable({
+		resolvers = resolvers,
+		DamageType = require "engine.DamageType",
+		newEntity = function(t)
+			-- Do we inherit things ?
+			if t.base then
+				for k, e in pairs(res[t.base]) do
+					if not t[k] then
+						t[k] = e
+					elseif type(t[k]) == "table" and type(e) == "table" then
+						copy_recurs(t[k], e)
 					end
-					t.base = nil
 				end
+				t.base = nil
+			end
+
+			local e = self.new(t, no_default)
+			print("loaded", e.name, no_default)
+			res[#res+1] = e
+			if t.define_as then res[t.define_as] = e end
+		end,
+		load = function(f)
+			local ret = self:loadList(f)
+			for i, e in ipairs(ret) do res[#res+1] = e end
+		end,
+		loadList = function(f)
+			return self:loadList(f)
+		end,
+	}, {__index=_G}))
+	f()
 
-				local e = self.new(t)
-				res[#res+1] = e
-				if t.define_as then res[t.define_as] = e end
---				print("new entity", t.name)
-				for k, ee in pairs(e) do
---					print("prop:", k, ee)
-				end
-			end,
-			load = function(f)
-				local ret = self:loadList(f)
-				for i, e in ipairs(ret) do res[#res+1] = e end
-			end,
-			loadList = function(f)
-				return self:loadList(f)
-			end,
-		}, {__index=_G}))
-		f()
-	end
 	return res
 end

@@ -3,8 +3,8 @@ local Entity = require "engine.Entity"
 
 module(..., package.seeall, class.inherit(Entity))
 
-function _M:init(t)
+function _M:init(t, no_default)
 	t = t or {}
 	self.name = t.name
-	Entity.init(self, t)
+	Entity.init(self, t, no_default)
 end

@@ -16,6 +16,8 @@ function _M:init(level, map)
 	self.e_distances = {}
 
 	self.distancer_co = self:createDistancer()
+
+	self.entities_list = {}
 end
 
 --- Adds an entity to the level
@@ -115,3 +117,14 @@ end
 function _M:idleProcessActor(act)
 	table.insert(self.e_toprocess, 1, act)
 end
+
+--- Setup an entity list for the level, this allwos the Zone to pick objects/actors/...
+function _M:setEntitiesList(type, list)
+	self.entities_list[type] = list
+	print("Stored entities list", type, list)
+end
+
+--- Gets an entity list for the level, this allows the Zone to pick objects/actors/...
+function _M:getEntitiesList(type)
+	return self.entities_list[type]
+end

@@ -3,14 +3,9 @@ local Entity = require "engine.Entity"
 
 module(..., package.seeall, class.inherit(Entity))
 
-function _M:init(t)
+function _M:init(t, no_default)
 	t = t or {}
-	Entity.init(self, t)
-end
-
-function _M:resolve(t)
-	Entity.resolve(self, t)
-	self.egos = nil
+	Entity.init(self, t, no_default)
 end
 
 --- Gets the full name of the object

@@ -52,7 +52,7 @@ function _M:computeRarities(list, level, ood, filter)
 			elseif lev > e.level_range[2] then max = 100 / (lev - e.level_range[2])
 			end
 			local genprob = max / e.rarity
-			print("prob", e.name, math.floor(genprob), "max", math.floor(max), e.level_range[1], e.level_range[2], lev)
+			print("prob", e.name, math.floor(genprob), "max", math.floor(max), e.level_range[1], e.level_range[2], lev, "egoable", e.egos and #e.egos)
 
 			r.total = r.total + genprob
 			r[#r+1] = { e=e, genprob=r.total + genprob, level_diff = lev - level }
@@ -76,6 +76,47 @@ function _M:pickEntity(list)
 	return nil
 end
 
+function _M:getEgosList(level, type, group, class)
+	-- Already loaded ? use it
+	local list = level:getEntitiesList(type.."/"..group)
+	if list then return list end
+
+	-- otehrwise loads it and store it
+	list = require(class):loadList(group, true)
+	level:setEntitiesList(type.."/"..group, list)
+
+	return list
+end
+
+function _M:makeEntity(level, type)
+	local list = level:getEntitiesList(type)
+	local e = self:pickEntity(list)
+	e = e:clone()
+	e:resolve()
+
+	-- Add "ego" properties
+	if e.egos then
+		local egos = self:getEgosList(level, type, e.egos, e.__CLASSNAME)
+		local ego = egos[rng.range(1, #egos)]
+		if ego then
+			print("ego", ego.__CLASSNAME, ego.name, getmetatable(ego))
+			ego = ego:clone()
+			ego:resolve()
+			local newname
+			if ego.prefix then
+				newname = ego.name .. e.name
+			else
+				newname = e.name .. ego.name
+			end
+			print("applying ego", ego.name, "to ", e.name, "::", newname)
+			table.merge(e, ego, true)
+			e.name = newname
+		end
+	end
+
+	return e
+end
+
 function _M:load()
 	local f, err = loadfile("/data/zones/"..self.short_name.."/zone.lua")
 	if err then error(err) end

@@ -7,7 +7,10 @@ function _M:init(zone, map, level)
 	engine.Generator.init(self, zone, map)
 	self.level = level
 	local data = level.data.generator.actor
-	self.npc_list = zone:computeRarities(zone.npc_list, level.level, data.ood, nil)
+
+	-- Setup the entities list
+	level:setEntitiesList("actor", zone:computeRarities(zone.npc_list, level.level, data.ood, nil))
+
 	if data.adjust_level_to_player and game:getPlayer() then
 		self.adjust_level_to_player = {base=game:getPlayer().level, min=data.adjust_level_to_player[1], max=data.adjust_level_to_player[2]}
 	end
@@ -17,10 +20,8 @@ end
 
 function _M:generate()
 	for i = 1, rng.range(self.nb_npc[1], self.nb_npc[2]) do
-		local m = self.zone:pickEntity(self.npc_list)
+		local m = self.zone:makeEntity(self.level, "actor")
 		if m then
-			m = m:clone()
-			m:resolve()
 			local x, y = rng.range(0, self.map.w), rng.range(0, self.map.h)
 			local tries = 0
 			while not m:canMove(x, y) and tries < 100 do

@@ -6,8 +6,11 @@ module(..., package.seeall, class.inherit(engine.Generator))
 function _M:init(zone, map, level)
 	engine.Generator.init(self, zone, map)
 	self.level = level
-	local data = level.data
-	self.object_list = zone:computeRarities(zone.object_list, level.level, data.generator and data.generator.actor and data.generator.actor.ood, nil)
+	local data = level.data.generator.object
+
+	-- Setup the entities list
+	level:setEntitiesList("object", zone:computeRarities(zone.object_list, level.level, data.ood, nil))
+
 	if data.adjust_level_to_player and game:getPlayer() then
 		self.adjust_level_to_player = {base=game:getPlayer().level, min=data.adjust_level_to_player[1], max=data.adjust_level_to_player[2]}
 	end
@@ -17,10 +20,8 @@ end
 
 function _M:generate()
 	for i = 1, rng.range(self.nb_object[1], self.nb_object[2]) do
-		local o = self.zone:pickEntity(self.object_list)
+		local o = self.zone:makeEntity(self.level, "object")
 		if o then
-			o = o:clone()
-			o:resolve()
 			local x, y = rng.range(0, self.map.w), rng.range(0, self.map.h)
 			local tries = 0
 			while (self.map:checkEntity(x, y, Map.TERRAIN, "block_move") or self.map(x, y, Map.OBJECT)) and tries < 100 do

@@ -25,7 +25,7 @@ module(..., package.seeall, class.inherit(
 	mod.class.interface.Combat
 ))
 
-function _M:init(t)
+function _M:init(t, no_default)
 	-- Define some basic combat stats
 	self.combat_def = 0
 	self.combat_armor = 0
@@ -54,7 +54,7 @@ function _M:init(t)
 	-- Default melee barehanded damage
 	self.combat = { dam=1, atk=1, apr=0, dammod={str=1} }
 
-	engine.Actor.init(self, t)
+	engine.Actor.init(self, t, no_default)
 	engine.interface.ActorInventory.init(self, t)
 	engine.interface.ActorTemporaryEffects.init(self, t)
 	engine.interface.ActorLife.init(self, t)

@@ -75,7 +75,7 @@ function _M:newGame()
 	self.player = Player.new{name=self.player_name}
 
 	local birth = Birther.new(self.player, {"base", "race", "subrace", "sex", "class", "subclass" }, function()
-		self.player.wild_x, self.player.wild_y = 38, 15
+		self.player.wild_x, self.player.wild_y = 39, 17
 		self:changeLevel(1)
 
 		local ds = LevelupStatsDialog.new(self.player)

@@ -3,8 +3,8 @@ require "engine.Grid"
 
 module(..., package.seeall, class.inherit(engine.Grid))
 
-function _M:init(t)
-	engine.Grid.init(self, t)
+function _M:init(t, no_default)
+	engine.Grid.init(self, t, no_default)
 end
 
 function _M:block_move(x, y, e)

@@ -4,8 +4,8 @@ require "mod.class.Actor"
 
 module(..., package.seeall, class.inherit(mod.class.Actor, engine.interface.ActorAI))
 
-function _M:init(t)
-	mod.class.Actor.init(self, t)
+function _M:init(t, no_default)
+	mod.class.Actor.init(self, t, no_default)
 	ActorAI.init(self, t)
 end
 

@@ -3,8 +3,8 @@ require "engine.Object"
 
 module(..., package.seeall, class.inherit(engine.Object))
 
-function _M:init(t)
-	engine.Object.init(self, t)
+function _M:init(t, no_default)
+	engine.Object.init(self, t, no_default)
 end
 
 function _M:tooltip()

@@ -6,7 +6,7 @@ local ActorTalents = require "engine.interface.ActorTalents"
 
 module(..., package.seeall, class.inherit(mod.class.Actor))
 
-function _M:init(t)
+function _M:init(t, no_default)
 	t.body = {
 		INVEN = 1000,
 		MAINHAND = 1,
@@ -20,7 +20,7 @@ function _M:init(t)
 		FEET = 1,
 		TOOL = 1,
 	}
-	mod.class.Actor.init(self, t)
+	mod.class.Actor.init(self, t, no_default)
 	self.player = true
 	self.faction = "players"
 

 newEntity{
-	name = "flaming ",
+	name = "flaming ", prefix=true,
 	level_range = {1, 10},
 	rarity = 3,
 	wielder = {

@@ -6,6 +6,7 @@ newEntity{
 	encumber = 5,
 	rarity = 3,
 	desc = [[Staves designed for wielders of magic, by the greats of the art.]],
+	egos = "/data/general/egos.lua",
 }
 
 newEntity{ base = "BASE_STAFF",

@@ -6,6 +6,7 @@ newEntity{
 	encumber = 3,
 	rarity = 3,
 	desc = [[Sharp, long, and deadly.]],
+	egos = "/data/general/egos.lua",
 }
 
 newEntity{ base = "BASE_LONGSWORD",

@@ -19,13 +19,13 @@ return {
 		},
 		actor = {
 			class = "engine.generator.actor.Random",
-			nb_npc = {20, 30},
+			nb_npc = {2, 3},
 			ood = {chance=5, range={1, 10}},
 			adjust_level_to_player = {-1, 2},
 		},
 		object = {
 			class = "engine.generator.object.Random",
-			nb_object = {3, 6},
+			nb_object = {100, 100},
 			ood = {chance=5, range={1, 10}},
 		},
 	},