diff --git a/game/engine/Zone.lua b/game/engine/Zone.lua
index d562da1d8304bebdf208eafb0ba45c2d89780c15..24468a241acca9e0094117891ce0142f0b0e992a 100644
--- a/game/engine/Zone.lua
+++ b/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
diff --git a/game/engine/generator/actor/Random.lua b/game/engine/generator/actor/Random.lua
index 2ac088da4c2801f1e03ba8c787ca269c7e3de472..0ea98007fa702b7e98f674c91e54fa9a04fcbb4b 100644
--- a/game/engine/generator/actor/Random.lua
+++ b/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]}
diff --git a/game/engine/generator/object/Random.lua b/game/engine/generator/object/Random.lua
index bbda74675c9273f41ae26179a727ad5a72b6bf67..bdea35335931fddf112ff3448eca9c5ac8448be5 100644
--- a/game/engine/generator/object/Random.lua
+++ b/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]}
diff --git a/game/modules/tome/data/gfx/object/potion-0x3.png b/game/modules/tome/data/gfx/object/potion-0x3.png
index dc10abf2efb2782d3fe8ca84246db869f3b39a74..6281f3318fe03644642175562e48febcc614d2f8 100644
Binary files a/game/modules/tome/data/gfx/object/potion-0x3.png and b/game/modules/tome/data/gfx/object/potion-0x3.png differ
diff --git a/game/modules/tome/data/gfx/object/potion-2x0.png b/game/modules/tome/data/gfx/object/potion-2x0.png
index 6fe99b5f67aa2c96103b02beec08b02adc97afba..cb7c600d636568511c43ede250a4650a7ccc2fb9 100644
Binary files a/game/modules/tome/data/gfx/object/potion-2x0.png and b/game/modules/tome/data/gfx/object/potion-2x0.png differ
diff --git a/game/modules/tome/data/gfx/object/potion-5x0.png b/game/modules/tome/data/gfx/object/potion-5x0.png
index 41ec3b6fbef9cdcdf233955ddf9690b4974e094d..8b6ee0872124b618c5ab5261d44fd278563263e3 100644
Binary files a/game/modules/tome/data/gfx/object/potion-5x0.png and b/game/modules/tome/data/gfx/object/potion-5x0.png differ
diff --git a/game/modules/tome/data/zones/maze/zone.lua b/game/modules/tome/data/zones/maze/zone.lua
index 455060db68357419eb5d71c31fa8c6481411e790..89aed63eabf0883068698fafe1e5eb114f451043 100644
--- a/game/modules/tome/data/zones/maze/zone.lua
+++ b/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" }, {}, {} }
},
},
diff --git a/game/modules/tome/data/zones/tower-amon-sul/zone.lua b/game/modules/tome/data/zones/tower-amon-sul/zone.lua
index 549928f8e9c2474c502a924afc39b67d771190b2..7eddaee077b5972878748c908ba332c5505052a4 100644
--- a/game/modules/tome/data/zones/tower-amon-sul/zone.lua
+++ b/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" }, {}, {} }
},
},
diff --git a/game/modules/tome/data/zones/trollshaws/zone.lua b/game/modules/tome/data/zones/trollshaws/zone.lua
index 34a43d4b15790934adb2c3775958714c8014c08f..320f092095b879bd453fd97a854e9798062a9f03 100644
--- a/game/modules/tome/data/zones/trollshaws/zone.lua
+++ b/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" }, {}, {} }
},
},