fixed wilderness encounter chance

unremarkable cave is now exitable


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

game/engine/generator/map/Static.lua

@@ -64,7 +64,7 @@ function _M:loadMap(file)
 		end,
 		prepareEntitiesList = function(type, class, file)
 			local list = require(class):loadList(file)
-			self.level:setEntitiesList(type, self.zone:computeRarities(type, list, self.level, nil))
+			self.level:setEntitiesList(type, list)
 		end,
 		addData = function(t)
 			table.merge(self.level.data, t, true)

game/modules/tome/class/Player.lua

@@ -117,12 +117,12 @@ function _M:move(x, y, force)
 		self.wild_x, self.wild_y = self.x, self.y
 		local g = game.level.map(self.x, self.y, Map.TERRAIN)
 		if g and g.can_encounter and game.level.data.encounters then
-			print(g,g.can_encounter, game.level.data.encounters)
 			local type = game.level.data.encounters.chance(self)
 			if type then
-				local e = game.zone:makeEntity(game.level, "encounters", {type=type, mapx=self.x, mapy=self.y, nb_tries=10})
+				game.level.level = self.level
+				game.level:setEntitiesList("encounters_rng", game.zone:computeRarities("encounters_rng", game.level:getEntitiesList("encounters"), game.level, nil))
+				local e = game.zone:makeEntity(game.level, "encounters_rng", {type=type, mapx=self.x, mapy=self.y, nb_tries=10})
 				if e then
-					print("Made encounter:", e.name)
 					if e:check("on_encounter", self) then
 						e:added()
 					end

game/modules/tome/data/maps/zones/unremarkable-cave.lua

@@ -32,7 +32,7 @@ subGenerator{
 		rooms = {"simple", "pilar"},
 		['.'] = "FLOOR",
 		['#'] = "WALL",
-		up = "UP",
+		up = "UP_WILDERNESS_FAR_EAST",
 		door = "DOOR",
 		force_tunnels = {
 			{"random", {85, 25}, id=-500},

game/modules/tome/data/zones/unremarkable-cave/zone.lua

@@ -48,12 +48,4 @@ return {
 			nb_trap = {10, 15},
 		},
 	},
-	levels =
-	{
-		[1] = {
-			generator = { map = {
-				up = "UP_WILDERNESS",
-			}, },
-		},
-	},
 }