From 4c5208267406d76c8882d603b1e224e17c217258 Mon Sep 17 00:00:00 2001 From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54> Date: Tue, 10 Aug 2010 17:37:14 +0000 Subject: [PATCH] fix git-svn-id: http://svn.net-core.org/repos/t-engine4@1004 51575b47-30f0-44d4-a5cc-537603b46e54 --- game/engine/Zone.lua | 2 +- game/modules/tome/data/zones/high-peak/npcs.lua | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/game/engine/Zone.lua b/game/engine/Zone.lua index 4962e47b73..9388d42406 100644 --- a/game/engine/Zone.lua +++ b/game/engine/Zone.lua @@ -225,7 +225,7 @@ function _M:makeEntity(level, type, filter, force_level, prob_filter) elseif type == "object" then base_list = self.object_list elseif type == "trap" then base_list = self.trap_list else return nil end - local list = self:computeRarities(type, base_list, level, function(e) return self:checkFilter(e, filter) end, filter.add_levels) + local list = self:computeRarities(type, base_list, level, function(e) return self:checkFilter(e, filter) end, filter.add_levels, filter.special_rarity) e = self:pickEntity(list) print("[MAKE ENTITY] prob list generation", e and e.name, "from list size", #list) if not e then return nil end diff --git a/game/modules/tome/data/zones/high-peak/npcs.lua b/game/modules/tome/data/zones/high-peak/npcs.lua index 57f89d275b..bd88faf808 100644 --- a/game/modules/tome/data/zones/high-peak/npcs.lua +++ b/game/modules/tome/data/zones/high-peak/npcs.lua @@ -16,8 +16,7 @@ -- -- Nicolas Casalini "DarkGod" -- darkgod@te4.org -load("/data/general/npcs/naga.lua", rarity(6)) ---[[ + -- Orcs & trolls load("/data/general/npcs/orc-grushnak.lua", rarity(0)) load("/data/general/npcs/orc-vor.lua", rarity(0)) @@ -41,7 +40,7 @@ load("/data/general/npcs/ghoul.lua", rarity(2)) load("/data/general/npcs/skeleton.lua", rarity(3)) load("/data/general/npcs/all.lua", rarity(4, 35)) -]] + local Talents = require("engine.interface.ActorTalents") -- Alatar & Palando, the final bosses -- GitLab