Fix d'old bug d'adept

The Adept prodigy in 1.6 was known to give an additional 0.3 mastery in some cases, often when the player got an escort tree. Now the effect of Adept has been changed, but this bug still remains and can be triggered, when you get bonus mastery over a tree whose category type you have a bonus mastery on, though these cases are much less likely to happen now. Currently there're 3 items giving bonus mastery to category types: Ring of the Warmaster giving bonus to Techniques, Rope Belt of Thaloren giving bonus to Wild-gifts if the wearer is a Thalore, and Radiance giving bonus to Celestials. Examples of cases that can trigger this bug:

1. You don't have Conditioning tree and have saved a warrior escort with the Ring of the Warmaster on. Then you'll get the Conditioning tree at 1.60 mastery.
2. You, a Thaloren Oozemancer who already unlocked Fungus tree with a category point, went to Zigur to complete the antimagic trial and then killed the High Tempest and came back to Zigur again to claim the rewards, with Rope Belt of Thaloren on all the time, will have both Antimagic and Fungus trees at 1.80 mastery. You get the 0.20 bonus mastery to Wild-gifts twice when the quests increase the masteries of the 2 trees. You can even unequip these items later, and the "free" bonus you get won't dissappear.

game/modules/tome/class/Actor.lua

@@ -834,7 +834,7 @@ function _M:useBuildOrder()
 						self:learnTalentType(tt)
 					else
 						self.__increased_talent_types[tt] = (self.__increased_talent_types[tt] or 0) + 1
-						self:setTalentTypeMastery(tt, self:getTalentTypeMastery(tt) + 0.2)
+						self:setTalentTypeMastery(tt, self:getTalentTypeMastery(tt, true) + 0.2)
 					end
 
 					game.log("#VIOLET#Following build order %s; learning talent category %s.", b.name, tt)
@@ -3111,6 +3111,10 @@ function _M:isMySummoner(act)
 	return false
 end
 
+function _M:playerControlled()
+	return false
+end
+
 function _M:emptyDrops()
 	local inven = self:getInven(self.INVEN_INVEN)
 	for i = #inven, 1, -1 do
@@ -3584,19 +3588,19 @@ function _M:levelupClass(c_data)
 
 		ttypes = {}
 		for tt, d in pairs(mclass.talents_types or {}) do
-			self:learnTalentType(tt, d[1]) self:setTalentTypeMastery(tt, (self:getTalentTypeMastery(tt) or 1) + d[2])
+			self:learnTalentType(tt, d[1]) self:setTalentTypeMastery(tt, (self:getTalentTypeMastery(tt, true) or 1) + d[2])
 			ttypes[tt] = table.clone(d)
 		end
 		for tt, d in pairs(mclass.unlockable_talents_types or {}) do
-			self:learnTalentType(tt, d[1]) self:setTalentTypeMastery(tt, (self:getTalentTypeMastery(tt) or 1) + d[2])
+			self:learnTalentType(tt, d[1]) self:setTalentTypeMastery(tt, (self:getTalentTypeMastery(tt, true) or 1) + d[2])
 			ttypes[tt] = table.clone(d)
 		end
 		for tt, d in pairs(c_def.talents_types or {}) do
-			self:learnTalentType(tt, d[1]) self:setTalentTypeMastery(tt, (self:getTalentTypeMastery(tt) or 1) + d[2])
+			self:learnTalentType(tt, d[1]) self:setTalentTypeMastery(tt, (self:getTalentTypeMastery(tt, true) or 1) + d[2])
 			ttypes[tt] = table.clone(d)
 		end
 		for tt, d in pairs(c_def.unlockable_talents_types or {}) do
-			self:learnTalentType(tt, d[1]) self:setTalentTypeMastery(tt, (self:getTalentTypeMastery(tt) or 1) + d[2])
+			self:learnTalentType(tt, d[1]) self:setTalentTypeMastery(tt, (self:getTalentTypeMastery(tt, true) or 1) + d[2])
 			ttypes[tt] = table.clone(d)
 		end
 
@@ -3609,14 +3613,14 @@ function _M:levelupClass(c_data)
 					else d=table.clone(d)
 					end
 					self:learnTalentType(tt, d[1])
-					self:setTalentTypeMastery(tt, (self:getTalentTypeMastery(tt) or 1) + d[2])
+					self:setTalentTypeMastery(tt, (self:getTalentTypeMastery(tt, true) or 1) + d[2])
 					ttypes[tt] = table.mergeAdd(ttypes[tt] or {}, d)
 				end
 			end
 		end
 		if not next(ttypes) then -- if not specified, use all known talent types
 			for tt, known in pairs(self.talents_types) do
-				ttypes[tt] = {known, (self:getTalentTypeMastery(tt) or 1) - 1}
+				ttypes[tt] = {known, (self:getTalentTypeMastery(tt, true) or 1) - 1}
 			end
 		end
 
@@ -3632,7 +3636,7 @@ function _M:levelupClass(c_data)
 			d.tt = tt
 			tt_count = tt_count + 1
 			d.tt_count = tt_count
-			d.rarity = d.rarity or (1.3 + 0.5*tt_count)/math.max(0.1, self:getTalentTypeMastery(tt)*rng.float(0.1, tt_focus))^2
+			d.rarity = d.rarity or (1.3 + 0.5*tt_count)/math.max(0.1, self:getTalentTypeMastery(tt, true)*rng.float(0.1, tt_focus))^2
 --print(("\t *** %-40s  rarity %5.3f"):format(tt, d.rarity))
 			if not d[1] then table.insert(unknown_tt, d) end
 		end
@@ -3702,7 +3706,7 @@ function _M:levelupClass(c_data)
 			if tt then
 				if self:knowTalentType(tt.tt) then
 					print("\t *** auto_levelup IMPROVING TALENT TYPE", tt.tt)
-					local ml = self:getTalentTypeMastery(tt.tt) or 1
+					local ml = self:getTalentTypeMastery(tt.tt, true) or 1
 					self:setTalentTypeMastery(tt.tt, ml + (ml <= 1 and 0.2 or 0.1)) -- 0.2 for 1st then 0.1 thereafter
 				elseif c_data.learned_talent_types < c_data.max_talent_types then
 					print("\t *** auto_levelup LEARNING TALENT TYPE", tt.tt)
@@ -3710,7 +3714,7 @@ function _M:levelupClass(c_data)
 					tt.rarity = tt.rarity/2  -- makes talents within an unlocked talent tree more likely to be learned
 					c_data.learned_talent_types = c_data.learned_talent_types + 1
 				end
-				--print("\t *** talent type mastery:", tt, self:getTalentTypeMastery(tt))
+				--print("\t *** talent type mastery:", tt, self:getTalentTypeMastery(tt, true))
 				self.unused_talents_types = self.unused_talents_types - 1
 			else fails = fails + 1
 			end
@@ -7219,10 +7223,10 @@ function _M:dispel(effid_or_tid, src, allow_immunity, params)
 			if not self:canBe("dispel_effects") then allowed = false end
 		end
 		if allowed and allow_immunity then
-			if self:fireTalentCheck("callbackOnDispel", "effect", effid_or_tid, src, allow_immunity) then allowed = false end
+			if self:fireTalentCheck("callbackOnDispel", "effect", effid_or_tid, src, allow_immunity, eff.desc) then allowed = false end
 		end
 		if allowed then
-			self:fireTalentCheck("callbackOnDispelled", "effect", effid_or_tid, src, allow_immunity)
+			self:fireTalentCheck("callbackOnDispelled", "effect", effid_or_tid, src, allow_immunity, eff.desc)
 			self:removeEffect(effid_or_tid, params.silent, params.force)
 			return true
 		else
@@ -7239,10 +7243,10 @@ function _M:dispel(effid_or_tid, src, allow_immunity, params)
 			if not self:canBe("dispel_sustains") then allowed = false end
 		end
 		if allowed and allow_immunity then
-			if self:fireTalentCheck("callbackOnDispel", "sustain", effid_or_tid, src, allow_immunity) then allowed = false end
+			if self:fireTalentCheck("callbackOnDispel", "sustain", effid_or_tid, src, allow_immunity, t.name) then allowed = false end
 		end
 		if allowed then
-			self:fireTalentCheck("callbackOnDispelled", "sustain", effid_or_tid, src, allow_immunity)
+			self:fireTalentCheck("callbackOnDispelled", "sustain", effid_or_tid, src, allow_immunity, t.name)
 			self:forceUseTalent(effid_or_tid, params)
 			return true
 		else