plop

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

game/modules/tome/class/Game.lua

@@ -1207,16 +1207,10 @@ function _M:setupCommands()
 		end end,
 		[{"_g","ctrl"}] = function() if config.settings.cheat then
 --			self:registerDialog(require("mod.dialogs.DownloadCharball").new())
---			local f, err = loadfile("/data/general/events/cultists.lua")
---			print(f, err)
---			setfenv(f, setmetatable({level=self.level, zone=self.zone}, {__index=_G}))
---			print(pcall(f))
-
-			local o = game.zone:makeEntity(game.level, "object", {type="weapon", random_object=true}, nil, true)
-			o:identify(true)
-			game.zone:addEntity(game.level, o, "object", game.player.x,game.player.y)
-
-
+			local f, err = loadfile("/data/general/events/cultists.lua")
+			print(f, err)
+			setfenv(f, setmetatable({level=self.level, zone=self.zone}, {__index=_G}))
+			print(pcall(f))
 			end end,
 		[{"_f","ctrl"}] = function() if config.settings.cheat then
 			self.player.quests["love-melinda"] = nil

game/modules/tome/class/interface/Combat.lua

@@ -1230,9 +1230,11 @@ end
 function _M:spellFriendlyFire()
 	local chance = (self:getLck() - 50) * 0.2
 	if self:isTalentActive(self.T_SPELLCRAFT) then chance = chance + self:getTalentLevelRaw(self.T_SPELLCRAFT) * 20 end
+	chance = chance + (self.combat_spell_friendlyfire or 0)
+
 	chance = 100 - chance
 	print("[SPELL] friendly fire chance", chance)
-	return chance
+	return util.bound(chance, 0, 100)
 end
 
 --- Gets mindpower

game/modules/tome/data/general/events/cultists.lua

@@ -17,6 +17,9 @@
 -- Nicolas Casalini "DarkGod"
 -- darkgod@te4.org
 
+-- Unique
+if game.state:doneEvent(event_id) then return end
+
 local list = {}
 
 local function check(x, y)
@@ -106,6 +109,8 @@ for i, p in ipairs(list) do
 			g:removeAllMOs()
 			game.level.map:updateMap(self.monolith_x, self.monolith_y)
 			if not game.level.turn_counter then
+				game.level.event_cultists.queen_x = self.monolith_x
+				game.level.event_cultists.queen_y = self.monolith_y
 				game.level.turn_counter = 10 * 150
 				game.level.max_turn_counter = 10 * 150
 				require("engine.ui.Dialog"):simplePopup("Cultist", "The cultist soul seems to be absorbed by the strange stone he was guarding. You feel like something is about to happen...")
@@ -130,6 +135,64 @@ game.zone.on_turn = function()
 		if game.level.turn_counter < 0 then
 			game.level.turn_counter = nil
 
+			local m = mod.class.NPC.new{
+				type = "demon", subtype = "major",
+				display = 'U',
+				name = "Shasshhiy'Kaish", color=colors.VIOLET, unique = true,
+--				resolvers.nice_tile{image="invis.png", add_mos = {{image="npc/demon_major_shasshhiy_kaish.png", display_h=2, display_y=-1}}},
+				desc = [[This demon would be very attractive if not for the hovering crown of flames, the three tails and sharp claws. As you watch her you can almost feel pain.]],
+				killer_message = "and used for her perverted desires",
+				level_range = {25, nil}, exp_worth = 2,
+				female = 1,
+				faction = "fearscape",
+				rank = 4,
+				size_category = 4,
+				max_life = 250, life_rating = 27, fixed_rating = true,
+				infravision = 10,
+				stats = { str=25, dex=25, cun=32, mag=26, con=14 },
+				move_others=true,
+
+				instakill_immune = 1,
+				stun_immune = 0.5,
+				blind_immune = 0.5,
+				combat_armor = 0, combat_def = 0,
+
+				open_door = true,
+
+				autolevel = "warriormage",
+				ai = "tactical", ai_state = { talent_in=2, ai_move="move_astar", },
+				ai_tactic = resolvers.tactic"melee",
+				resolvers.inscriptions(3, "rune"),
+
+				body = { INVEN = 10, MAINHAND=1, OFFHAND=1, BODY=1 },
+
+				combat = { dam=resolvers.levelup(resolvers.mbonus(86, 20), 1, 1.4), atk=50, apr=30, dammod={str=1.1} },
+
+				resolvers.drops{chance=100, nb=5, {tome_drops="boss"} },
+
+				resolvers.talents{
+					[Talents.T_METEOR_RAIN]={base=4, every=5, max=7},
+					[Talents.T_INNER_DEMONS]={base=4, every=5, max=7},
+					[Talents.T_FLAME_OF_URH_ROK]={base=5, every=5, max=8},
+					[Talents.T_PACIFICATION_HEX]={base=5, every=5, max=8},
+					[Talents.T_BURNING_HEX]={base=5, every=5, max=8},
+					[Talents.T_BLOOD_LOCK]={base=5, every=5, max=8},
+					[Talents.T_SPELLCRAFT]=5,
+				},
+				resolvers.sustains_at_birth(),
+
+				inc_damage = {all=90},
+			}
+			m:resolve() m:resolve(nil, true)
+
+			local x, y = util.findFreeGrid(game.level.event_cultists.queen_x-1, game.level.event_cultists.queen_y, 10, true, {[engine.Map.ACTOR]=true})
+			if x then
+				m.inc_damage.all = m.inc_damage.all - 10 * (game.level.event_cultists.kill)
+				m.max_life = m.max_life * (14 - game.level.event_cultists.kill) / 14
+
+				game.zone:addEntity(game.level, m, "actor", x, y) 
+				require("engine.ui.Dialog"):simplePopup("Cultist", "A terrible shout thunders across the level: 'Come my darling, come, I will be ssssooo *nice* to you!'")
+			end
 		elseif  game.level.turn_counter == 10 * 130 or
 			game.level.turn_counter == 10 * 110 or
 			game.level.turn_counter == 10 * 90 or

game/modules/tome/data/general/events/drake-cave.lua

@@ -66,7 +66,7 @@ local changer = function(id, kind)
 			object = {
 				class = "engine.generator.object.Random",
 				filters = {{type="gem"}},
-				nb_object = {15, 25},
+				nb_object = {25, 35},
 			},
 			trap = {
 				class = "engine.generator.trap.Random",