被动触发

zhouhaihai
1 parent b6a2b78b
Showing 4 changed files with 105 additions and 26 deletions Show diff stats
src/adv/Adv.lua
src/adv/AdvMap.lua
src/adv/AdvPassive.lua
src/adv/AdvPlayer.lua
@@ -1883,23 +1883,31 @@ end
  
 -- 地图上物品变化
 function Adv:mapItemChange(ctype)
+	local blocks = {}
+	for roomId, room in pairs(self:getCurMap().rooms) do
+		for blockId, block in pairs(room.blocks) do
+			table.insert(blocks, block)
+		end
+	end
+	self:blockDropChange(ctype, blocks)
+end
+
+function Adv:blockDropChange(ctype, blocks)
 	local clist = csvdb["transform_itemCsv"][ctype]
 	if clist then
-		for roomId, room in pairs(self:getCurMap().rooms) do
-			for blockId, block in pairs(room.blocks) do
-				if block:getEventType() == AdvEventType.Drop and block.event.item then
-					local id = block.event.item[1]
-					local count = block.event.item[2]
-					local changeTo = nil
-					if clist[id] then
-						changeTo = {clist[id].toId, math.ceil(count * clist[id].num)}
-					elseif clist[-1] then
-						changeTo = {clist[-1].toId, math.ceil(count * clist[-1].num)}
-					end
-					if changeTo and changeTo[1] ~= 0 and changeTo[2] ~= 0 then
-						block.event.item = changeTo
-						self:backBlockChange(roomId, blockId, ctype)
-					end
+		for _, block in ipairs(blocks) do
+			if block:getEventType() == AdvEventType.Drop and block.event.item then
+				local id = block.event.item[1]
+				local count = block.event.item[2]
+				local changeTo = nil
+				if clist[id] then
+					changeTo = {clist[id].toId, math.ceil(count * clist[id].num)}
+				elseif clist[-1] then
+					changeTo = {clist[-1].toId, math.ceil(count * clist[-1].num)}
+				end
+				if changeTo and changeTo[1] ~= 0 and changeTo[2] ~= 0 then
+					block.event.item = changeTo
+					self:backBlockChange(block.room.roomId, block.blockId, ctype)
 				end
 			end
 		end
@@ -256,7 +256,7 @@ function Map:openBlock(roomId, blockId, isPlayer, ignoreBack)
  
 	if status then
 		if isPlayer then
-			self.adv.battle:triggerPassive(Passive.OPEN_BLOCK)
+			self.adv.battle:triggerPassive(Passive.OPEN_BLOCK, {roomId = roomId, blockId = blockId})
 			self.adv.owner:checkTaskEnter("AdvOpenBlock")
  
 			-- 潜行检查
@@ -292,21 +292,38 @@ function Map:openBlocksByRoom(roomId, isPlayer, ignoreBack)
 	end
 end
  
-function Map:openBlocksIsMonsterByRoom(roomId, isPlayer, ignoreBack)
+function Map:openBlocksIsMonsterByRoom(roomId, count, isPlayer, ignoreBack)
 	local room = self.rooms[roomId]
 	if not room then return end 
  
-	local enemys = {}
+	local allBlock = {}
 	for blockId, block in pairs(room.blocks) do
-		if block:isMonster() then
-			if self:openBlock(roomId, blockId, isPlayer, ignoreBack) then
-				local e = self.adv.battle:getEnemy(block.room.roomId, block.blockId)
-				if e then
-					table.insert(enemys, e)
-				end
+		if block:isMonster() and not block.isOpen then
+			table.insert(allBlock, blockId)
+		end
+	end
+
+	local enemys = {}
+	local openBlock = function(blockId)
+		if self:openBlock(roomId, blockId, isPlayer, ignoreBack) then
+			local e = self.adv.battle:getEnemy(roomId, blockId)
+			if e then
+				table.insert(enemys, e)
 			end
 		end
 	end
+
+	if not count or count == -1 or count >= len(allBlock) then
+		for _, blockId in ipairs(allBlock)  do
+			openBlock(blockId)
+		end
+	else
+		for i = 1, count do
+			local idx = math.randomInt(1, len(allBlock))
+			openBlock(allBlock[idx])
+			table.remove(allBlock, idx)
+		end
+	end
 	return enemys
 end
  
@@ -327,6 +344,22 @@ function Map:getRBByPos(c, r)
 	end
 end
  
+function Map:getDistance(froomId, fblockId, troomId, tblockId)
+	local distance = -1
+	local room1 = self.rooms[froomId]
+	local room2 = self.rooms[troomId]
+	if room1 and room2 then
+		local block1 = room1[fblockId]
+		local block2 = room2[tblockId]
+		if block1 and block2 then
+			local c1, r1 = room1:tranLtoG(block1.col, block1.row)
+			local c2, r2 = room2:tranLtoG(block2.col, block2.row)
+			distance = math.max(math.abs(c1 - c2), math.abs(r1 - r2))
+		end
+	end
+	return distance
+end
+
 function Map:getAroundBlocks(room, block)
 	local blocks = {}
 	local range = {1, -1}
@@ -7,6 +7,8 @@ Filter.HP_LOW = 4 -- 血量&lt;value%
 Filter.BUFF_BY_TYPE = 5 -- 指定类型buff
 Filter.BUFF_BY_ID = 6 -- 指定id的buff
 Filter.CAMP = 7 -- 玩家是指定阵营
+Filter.RANGE = 8 -- 筛选范围 （触发是地块）
+Filter.CLASSIFY = 9 -- 标签
  
 local FilterFactory = {}
 FilterFactory[Filter.HP_UP_WITH_EQUAL] = function (_Filter)
@@ -46,6 +48,23 @@ FilterFactory[Filter.CAMP] = function (_Filter)
 	end
 end
  
+FilterFactory[Filter.RANGE] = function (_Filter)
+	_Filter._execute = function (self, target, params)
+		if self.owner.blockId and self.owner.roomId  and params.blockId and params.roomId then
+			local distance = self.owner.battle.adv:getCurMap():getDistance(self.owner.roomId, self.owner.blockId, params.roomId, params.blockId)
+			return distance ~= -1 and distance <= self.value
+		end
+		return false
+	end
+end
+
+FilterFactory[Filter.CLASSIFY] = function (_Filter)
+	_Filter._execute = function (self, target)
+		if not target.monsterId then return end
+		local classify = csvdb["event_monsterCsv"][target.monsterId].classify
+		return classify and classify:sismember(self.value, " ")
+	end
+end
  
 function Filter:ctor(params)
 	self.owner = params.owner
@@ -79,7 +98,7 @@ function Filter:execute(params)
 		return
 	end
 	if self:_execute(target) then
-		return self:_execute(target)
+		return self:_execute(target, params)
 	end
 end
  
@@ -120,6 +139,7 @@ Passive.GET_BUFF = 28 --获得指定buff
 Passive.OPEN_BLOCK = 29 --翻开格子
 Passive.OPEN_MONSTER = 30 --翻开怪物
 Passive.PLAYER_BUFF = 31 --玩家获得buff
+
 Passive.PLAYER_BUFF_CLASSIFY = 35 -- 获得指定标签的buff
  
 -- 不同的开启条件
@@ -442,6 +462,7 @@ end
  
 --3=翻开自己所在格子
 function Passive:effect3(value)
+	if not self.owner.roomId or not self.owner.blockId then return end
 	if value == 0 then
 		self.owner.battle.adv:getCurMap():openBlock(self.owner.roomId, self.owner.blockId)
 	elseif value > 0 then
@@ -561,5 +582,22 @@ function Passive:effect14(value, triggerPms, enemyId)
 	end
 end
  
+--15=翻开房间内的count 个怪 并且增加一个buff
+function Passive:effect15(count, triggerPms, buffId)
+	local roomId = self.owner.roomId
+	if not roomId then return end
+	local enemys = self.owner.battle.adv:getCurMap():openBlocksIsMonsterByRoom(roomId, count)
+	for _, e in ipairs(enemys) do
+		e:addBuff(buffId)
+	end
+end
+
+--16=转变 value 范围内的掉落物 为 id count
+function Passive:effect16(value, triggerPms, changeType)
+	if not self.owner.roomId or not self.owner.blockId then return end
+	local blocks = self.owner.battle.adv:getCurMap():getBlocksBySize(self.owner.roomId, self.owner.blockId, value)
+	self.owner.battle.adv:blockDropChange(changeType, blocks)
+end
+
  
 return Passive
 \ No newline at end of file
@@ -417,7 +417,7 @@ function BaseObject:hurt(value, releaser, params)
 	if self.hp == 0 then
 		self:triggerPassive(Passive.SELF_DEAD)
 		for _, team in ipairs(self:getTeam(1, true)) do
-			team:triggerPassive(Passive.TEAM_DEAD)
+			team:triggerPassive(Passive.TEAM_DEAD, {trigger = self})
 		end
  
 		if (params.hurtType == 6 or params.hurtType == 2) and self ~= self.battle.player then