transparetn potions

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

game/engine/Zone.lua

@@ -45,18 +45,13 @@ end
 --- Parses the npc/objects list and compute rarities for random generation
 -- ONLY entities with a rarity properties will be considered.<br/>
 -- This means that to get a never-random entity you simply do not put a rarity property on it.
-function _M:computeRarities(type, list, level, ood, filter)
+function _M:computeRarities(type, list, level, filter)
 	local r = { total=0 }
 	print("******************", level.level)
 	for i, e in ipairs(list) do
 		if e.rarity and e.level_range and (not filter or filter(e)) then
 --			print("computing rarity of", e.name)
 			local lev = self.base_level + (level.level - 1)
-			-- Out of Depth chance
---			if ood and rng.percent(ood.chance) then
---				lev = self.base_level + level.level - 1 + rng.range(ood.range[1], ood.range[2])
---				print("OOD Entity !", e.name, ":=:", level.level, "to", lev)
---			end
 
 			local max = 10000
 			if lev < e.level_range[1] then max = 10000 / (3 * (e.level_range[1] - lev))
@@ -69,7 +64,7 @@ function _M:computeRarities(type, list, level, ood, filter)
 			if e.egos and not level:getEntitiesList(type.."/"..e.egos) then
 				local egos = self:getEgosList(level, type, e.egos, e.__CLASSNAME)
 				if egos then
-					egos = self:computeRarities(type, egos, level, ood, filter)
+					egos = self:computeRarities(type, egos, level, filter)
 					level:setEntitiesList(type.."/"..e.egos, egos)
 				end
 			end

game/engine/generator/actor/Random.lua

@@ -9,7 +9,7 @@ function _M:init(zone, map, level)
 	local data = level.data.generator.actor
 
 	-- Setup the entities list
-	level:setEntitiesList("actor", zone:computeRarities("actor", zone.npc_list, level, data.ood, nil))
+	level:setEntitiesList("actor", zone:computeRarities("actor", zone.npc_list, level, nil))
 
 	if data.adjust_level and game:getPlayer() then
 		self.adjust_level = {base=zone.base_level, min=data.adjust_level[1], max=data.adjust_level[2]}

game/engine/generator/object/Random.lua

@@ -9,7 +9,7 @@ function _M:init(zone, map, level)
 	local data = level.data.generator.object
 
 	-- Setup the entities list
-	level:setEntitiesList("object", zone:computeRarities("object", zone.object_list, level, data.ood, nil))
+	level:setEntitiesList("object", zone:computeRarities("object", zone.object_list, level, 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]}

game/modules/tome/data/zones/maze/zone.lua

@@ -18,14 +18,12 @@ return {
 		actor = {
 			class = "engine.generator.actor.Random",
 			nb_npc = {20, 30},
-			ood = {chance=5, range={1, 10}},
 			adjust_level = {-1, 2},
 			guardian = "TROLL_BILL",
 		},
 		object = {
 			class = "engine.generator.object.Random",
 			nb_object = {4, 6},
-			ood = {chance=5, range={1, 10}},
 			filters = { {type="potion" }, {type="potion" }, {type="potion" }, {type="scroll" }, {}, {} }
 		},
 	},

game/modules/tome/data/zones/tower-amon-sul/zone.lua

@@ -22,14 +22,12 @@ return {
 		actor = {
 			class = "engine.generator.actor.Random",
 			nb_npc = {20, 30},
-			ood = {chance=5, range={1, 10}},
 			adjust_level = {-1, 2},
 			guardian = "SHADE_OF_ANGMAR",
 		},
 		object = {
 			class = "engine.generator.object.Random",
 			nb_object = {4, 6},
-			ood = {chance=5, range={1, 10}},
 			filters = { {type="potion" }, {type="potion" }, {type="potion" }, {type="scroll" }, {}, {} }
 		},
 	},

game/modules/tome/data/zones/trollshaws/zone.lua

@@ -21,14 +21,12 @@ return {
 		actor = {
 			class = "engine.generator.actor.Random",
 			nb_npc = {20, 30},
-			ood = {chance=5, range={1, 10}},
 			adjust_level = {-1, 2},
 			guardian = "TROLL_BILL",
 		},
 		object = {
 			class = "engine.generator.object.Random",
-			nb_object = {4, 6},
-			ood = {chance=5, range={1, 10}},
+			nb_object = {400, 600},
 			filters = { {type="potion" }, {type="potion" }, {type="potion" }, {type="scroll" }, {}, {} }
 		},
 	},