From 4a52634438947796f410ce85c196bcf1193c9112 Mon Sep 17 00:00:00 2001
From: dg <dg@51575b47-30f0-44d4-a5cc-537603b46e54>
Date: Fri, 17 May 2013 17:22:38 +0000
Subject: [PATCH] Fixed some randart powers not being applied

git-svn-id: http://svn.net-core.org/repos/t-engine4@6738 51575b47-30f0-44d4-a5cc-537603b46e54
---
 game/modules/tome/class/GameState.lua | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/game/modules/tome/class/GameState.lua b/game/modules/tome/class/GameState.lua
index a07759c938..77686a6767 100644
--- a/game/modules/tome/class/GameState.lua
+++ b/game/modules/tome/class/GameState.lua
@@ -428,7 +428,7 @@ function _M:generateRandart(data)
 		local p = powers[i]
 		if p and p.points <= hpoints*2 then -- Intentionally allow the budget to be exceeded slightly to guarantee powers at low levels
 			local scaleup = math.max(1,(lev/(p.level_range[2] or 50))^0.5) --Adjust scaleup factor for each power based on lev and level_range max
---			print(" * adding power: "..p.name)
+--			print(" * adding power: "..p.name.."("..p.points.." points)")
 			if p.wielder then
 				o.wielder = o.wielder or {}
 				merger(o.wielder, p.wielder, scaleup)
@@ -467,8 +467,16 @@ function _M:generateRandart(data)
 				o.wielder = o.wielder or {}
 				merger(o.wielder, p.wielder, scaleup)
 			end
+			if p.combat then
+				o.combat = o.combat or {}
+				merger(o.combat, p.combat, scaleup)
+			end
+			if p.special_combat then
+				o.special_combat = o.special_combat or {}
+				merger(o.special_combat, p.special_combat, scaleup)
+			end
 			if p.copy then merger(o, p.copy, scaleup) end
---			print(" * adding bias power: "..p.name)
+--			print(" * adding bias power: "..p.name.."("..p.points.." points)")
 			hpoints = hpoints - p.points
 			p.points = p.points * 1.5 --increased cost (=diminishing returns) on extra applications of the same power
 		else
-- 
GitLab