Fixed Psiblades putting charms on cooldown and adding back stuff to the hotkeys

game/modules/tome/class/Player.lua

@@ -1426,13 +1426,16 @@ end
 -- This doesnt call the base interface onWear, it copies the code because we need some tricky stuff
 function _M:onWear(o, slot, bypass_set)
 	mod.class.Actor.onWear(self, o, slot, bypass_set)
-	self:cooldownWornObject(o)
-	if self.hotkey and o:canUseObject() and config.settings.tome.auto_hotkey_object and not o.no_auto_hotkey then
-		local position
-		local name = o:getName{no_count=true, force_id=true, no_add_name=true}
 
-		if not self:isHotkeyBound("inventory", name) then
-			self:addNewHotkey("inventory", name)
+	if not self:attr("on_wear_simple_reload") then
+		self:cooldownWornObject(o)
+		if self.hotkey and o:canUseObject() and config.settings.tome.auto_hotkey_object and not o.no_auto_hotkey then
+			local position
+			local name = o:getName{no_count=true, force_id=true, no_add_name=true}
+
+			if not self:isHotkeyBound("inventory", name) then
+				self:addNewHotkey("inventory", name)
+			end
 		end
 	end
 

game/modules/tome/data/talents/gifts/mindstar-mastery.lua

@@ -44,9 +44,11 @@ newTalent{
 			tmpid = self:addTemporaryValue("psiblades_active", self:getTalentLevel(t)),
 		}
 
+		self:attr("on_wear_simple_reload", 1)
 		for i, o in ipairs(self:getInven("MAINHAND") or {}) do self:onTakeoff(o, self.INVEN_MAINHAND, true) self:onWear(o, self.INVEN_MAINHAND, true) end
 		for i, o in ipairs(self:getInven("OFFHAND") or {}) do self:onTakeoff(o, self.INVEN_OFFHAND, true) self:onWear(o, self.INVEN_OFFHAND, true) end
 		for i, o in ipairs(self:getInven("PSIONIC_FOCUS") or {}) do self:onTakeoff(o, self.INVEN_PSIONIC_FOCUS, true) self:onWear(o, self.INVEN_PSIONIC_FOCUS, true) end
+		self:attr("on_wear_simple_reload", -1)
 		self:updateModdableTile()
 
 		return r
@@ -54,9 +56,11 @@ newTalent{
 	deactivate = function(self, t, p)
 		self:removeTemporaryValue("psiblades_active", p.tmpid)
 
+		self:attr("on_wear_simple_reload", 1)
 		for i, o in ipairs(self:getInven("MAINHAND") or {}) do self:onTakeoff(o, self.INVEN_MAINHAND, true) self:checkMindstar(o) self:onWear(o, self.INVEN_MAINHAND, true) end
 		for i, o in ipairs(self:getInven("OFFHAND") or {}) do self:onTakeoff(o, self.INVEN_OFFHAND, true) self:checkMindstar(o) self:onWear(o, self.INVEN_OFFHAND, true) end
 		for i, o in ipairs(self:getInven("PSIONIC_FOCUS") or {}) do self:onTakeoff(o, self.INVEN_PSIONIC_FOCUS, true) self:checkMindstar(o) self:onWear(o, self.INVEN_PSIONIC_FOCUS, true) end
+		self:attr("on_wear_simple_reload", -1)
 		self:updateModdableTile()
 
 		return true