sorry not working

git-svn-id: http://svn.net-core.org/repos/t-engine4@5084 51575b47-30f0-44d4-a5cc-537603b46e54

game/modules/tome/class/Game.lua

@@ -1115,13 +1115,19 @@ function _M:setupCommands()
 			end end
 		end end,
 		[{"_g","ctrl"}] = function() if config.settings.cheat then
-			local base = game.zone:makeEntity(game.level, "object", {ingore_material_restriction=true, no_tome_drops=true, ego_filter={keep_egos=true, ego_chance=-1000}, type='charm',subtype='wand'}, nil, true)
-			local a = self.state:generateRandart(false, base, 50, 3)
-			local o = a:clone()
-			o:resolve()
-			o:resolve(nil, true)
-			o:identify(true)
-			game.zone:addEntity(game.level, o, "object", self.player.x, self.player.y)
+			local m = game.zone:makeEntity(game.level, "actor", {random_boss={
+				nb_classes=1,
+				rank=3, ai = "tactical",
+				life_rating=function(v) return v * 1.3 + 2 end,
+				loot_quality = "store",
+				loot_quantity = 1,
+				drop_equipment = false,
+				no_loot_randart = true,
+			}}, nil, true)
+
+			FINISH ME
+
+			if m then game.zone:addEntity(game.level, m, "actor", self.player.x, self.player.y-1) end
 		end end,
 		[{"_f","ctrl"}] = function() if config.settings.cheat then
 			self.player.quests["love-melinda"] = nil

game/modules/tome/class/GameState.lua

@@ -1526,7 +1526,7 @@ function _M:createRandomBoss(base, data)
 					d.name = nil
 					d.ego_chance = nil
 					d.tome_drops = data.loot_quality or "boss"
-					d.force_drop = true
+					d.force_drop = (data.drop_equipment == nil) and true or data.drop_equipment
 				end
 				b[#b+1] = resolver
 			elseif k == "birth_create_alchemist_golem" then

game/modules/tome/data/talents/psionic/other.lua

@@ -141,16 +141,19 @@ newTalent{
 		end
 		return hit
 	end,
-	activate = function (self, t)
-		if not self:getInven("PSIONIC_FOCUS") then return end
+	on_pre_use = function (self, t)
+		if not self:getInven("PSIONIC_FOCUS") then return false end
 		local tkweapon = self:getInven("PSIONIC_FOCUS")[1]
 		if type(tkweapon) == "boolean" then tkweapon = nil end
 		if not tkweapon or tkweapon.type == "gem" or tkweapon.archery then
-			game.logPlayer(self, "You cannot do that without a telekinetically-wielded melee weapon.")
-			return nil
+--			game.logPlayer(self, "You cannot do that without a telekinetically-wielded melee weapon.")
+			return false
 		end
 		return true
 	end,
+	activate = function (self, t)
+		return true
+	end,
 	deactivate =  function (self, t)
 		return true
 	end,

ideas/todo

-* autoexport character entity on death/win(/save?)
 * RSS feed of events in a character's life, exportable to FB
 * PIC TALENTS AT LVL 45 FOR HIGH STAT, CLASS DEPENDANT
 * redo shops