Added a copy_add field to player descriptors

Class life rating now adds to race life rating instead of overriding it


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

game/engines/default/engine/Birther.lua

@@ -274,6 +274,16 @@ function _M:apply()
 			-- Copy normal data
 			table.merge(self.actor, copy, true)
 		end
+		if d.copy_add then
+			local copy = table.clone(d.copy_add, true)
+			-- Append array part
+			while #copy > 0 do
+				local f = table.remove(copy)
+				table.insert(self.actor, f)
+			end
+			-- Copy normal data
+			table.mergeAdd(self.actor, copy, true)
+		end
 		-- Change stats
 		if d.stats then
 			for stat, inc in pairs(d.stats) do

game/modules/tome/data/birth/classes/afflicted.lua

@@ -68,10 +68,12 @@ newBirthDescriptor{
 	},
 	copy = {
 		max_life = 110,
-		life_rating = 12,
 		resolvers.equip{ id=true,
 			{type="weapon", subtype="battleaxe", name="iron battleaxe", autoreq=true},
 			{type="armor", subtype="light", name="rough leather armour", autoreq=true}
 		},
 	},
+	copy_add = {
+		life_rating = 2,
+	},
 }

game/modules/tome/data/birth/classes/archer.lua

@@ -34,7 +34,6 @@ newBirthDescriptor{
 	},
 	copy = {
 		max_life = 110,
-		life_rating = 10,
 	},
 }
 

game/modules/tome/data/birth/classes/corrupted.lua

@@ -33,7 +33,6 @@ newBirthDescriptor{
 	},
 	copy = {
 		max_life = 120,
-		life_rating = 12,
 	},
 }
 
@@ -73,6 +72,9 @@ newBirthDescriptor{
 			{type="armor", subtype="heavy", name="iron mail armour", autoreq=true}
 		},
 	},
+	copy_add = {
+		life_rating = 2,
+	},
 }
 
 newBirthDescriptor{

game/modules/tome/data/birth/classes/divine.lua

@@ -72,13 +72,15 @@ newBirthDescriptor{
 	},
 	copy = {
 		max_life = 110,
-		life_rating = 12,
 		resolvers.equip{ id=true,
 			{type="weapon", subtype="mace", name="iron mace", autoreq=true},
 			{type="armor", subtype="shield", name="iron shield", autoreq=true},
 			{type="armor", subtype="heavy", name="iron mail armour", autoreq=true},
 		},
 	},
+	copy_add = {
+		life_rating = 2,
+	},
 }
 
 newBirthDescriptor{

game/modules/tome/data/birth/classes/mage.lua

@@ -83,7 +83,6 @@ newBirthDescriptor{
 		-- All mages are of angolwen faction
 		faction = "angolwen",
 		max_life = 90,
-		life_rating = 10,
 		resolvers.equip{ id=true,
 			{type="weapon", subtype="staff", name="elm staff", autoreq=true},
 			{type="armor", subtype="cloth", name="linen robe", autoreq=true},
@@ -129,7 +128,6 @@ newBirthDescriptor{
 	},
 	copy = {
 		max_life = 90,
-		life_rating = 10,
 		resolvers.equip{ id=true,
 			{type="weapon", subtype="staff", name="elm staff", autoreq=true},
 			{type="armor", subtype="cloth", name="linen robe", autoreq=true}
@@ -196,7 +194,6 @@ newBirthDescriptor{
 		-- All mages are of angolwen faction
 		faction = "angolwen",
 		max_life = 90,
-		life_rating = 10,
 		resolvers.equip{ id=true,
 			{type="weapon", subtype="staff", name="elm staff", autoreq=true},
 			{type="armor", subtype="cloth", name="linen robe", autoreq=true},
@@ -246,7 +243,6 @@ newBirthDescriptor{
 		-- All mages are of angolwen faction
 		faction = "angolwen",
 		max_life = 90,
-		life_rating = 10,
 		resolvers.equip{ id=true,
 			{type="weapon", subtype="staff", name="elm staff", autoreq=true},
 			{type="armor", subtype="cloth", name="linen robe", autoreq=true},
@@ -297,7 +293,6 @@ newBirthDescriptor{
 		-- All mages are of angolwen faction
 		faction = "angolwen",
 		max_life = 90,
-		life_rating = 10,
 		resolvers.equip{ id=true,
 			{type="weapon", subtype="staff", name="elm staff", autoreq=true},
 			{type="armor", subtype="cloth", name="linen robe", autoreq=true},

game/modules/tome/data/birth/classes/rogue.lua

@@ -34,7 +34,6 @@ newBirthDescriptor{
 	},
 	copy = {
 		max_life = 100,
-		life_rating = 10,
 		equipment = resolvers.equip{ id=true,
 			{type="weapon", subtype="dagger", name="iron dagger", autoreq=true},
 			{type="weapon", subtype="dagger", name="iron dagger", autoreq=true},

game/modules/tome/data/birth/classes/tutorial.lua

@@ -33,11 +33,13 @@ newBirthDescriptor{
 	},
 	copy = {
 		max_life = 100,
-		life_rating = 12,
 		mana_regen = 0.2,
 		life_regen = 1,
 		mana_rating = 7,
 	},
+	copy_add = {
+		life_rating = 2,
+	},
 }
 
 newBirthDescriptor{

game/modules/tome/data/birth/classes/warrior.lua

@@ -35,7 +35,9 @@ newBirthDescriptor{
 	},
 	copy = {
 		max_life = 120,
-		life_rating = 12,
+	},
+	copy_add = {
+		life_rating = 2,
 	},
 }
 
@@ -157,7 +159,6 @@ newBirthDescriptor{
 	},
 	copy = {
 		max_life = 100,
-		life_rating = 9,
 		resolvers.equip{ id=true,
 			{type="weapon", subtype="greatsword", name="iron greatsword", autoreq=true},
 			{type="armor", subtype="light", name="rough leather armour", autoreq=true},

game/modules/tome/data/birth/classes/wilder.lua

@@ -68,7 +68,6 @@ newBirthDescriptor{
 	},
 	copy = {
 		max_life = 90,
-		life_rating = 10,
 		resolvers.equip{ id=true,
 			{type="weapon", subtype="staff", name="elm staff", autoreq=true},
 			{type="armor", subtype="light", name="rough leather armour", autoreq=true}
@@ -109,10 +108,12 @@ newBirthDescriptor{
 	},
 	copy = {
 		max_life = 110,
-		life_rating = 12,
 		resolvers.equip{ id=true,
 			{type="weapon", subtype="battleaxe", name="iron battleaxe", autoreq=true},
 			{type="armor", subtype="light", name="rough leather armour", autoreq=true}
 		},
 	},
+	copy_add = {
+		life_rating = 2,
+	},
 }