增加移除项目排除功能

zhouhaihai
1 parent e085da41
Showing 2 changed files with 11 additions and 5 deletions Show diff stats
src/adv/AdvMap.lua
src/adv/AdvPassive.lua
@@ -188,14 +188,16 @@ function Map:eventChangeToOther(eventTypeF, eventIdF, eventTypeT, eventIdT, coun
 	return change
 end
-function Map:clearEventById(eventType, eventId, count)
+function Map:clearEventById(eventType, eventId, count, exclude)
 	count = count or 0
 	eventId = eventId or 0
+	exclude = exclude or {}
 	local pool = {}
-	for _, room_ in pairs(self.rooms) do
-		for _, block_ in pairs(room_.blocks) do
-			if block_.isOpen and block_:getEventType() == eventType and (eventId == 0 or block_.event.id == eventId) then
+	for roomId, room_ in pairs(self.rooms) do
+		exclude[roomId] = exclude[roomId] or {}
+		for blockId, block_ in pairs(room_.blocks) do
+			if not exclude[roomId][blockId] and block_.isOpen and block_:getEventType() == eventType and (eventId == 0 or block_.event.id == eventId) then
 				table.insert(pool, {room_, block_})
 			end
 		end
@@ -497,7 +497,11 @@ end
 -- 移除指定项目					
 function Passive:effect13(eventType, triggerPms, eventId, count)
-	local change = self.owner.battle.adv:getCurMap():clearEventById(eventType, eventId, count)
+	local exclude = {}
+	if self.owner:is("Enemy") then
+		exclude[self.owner.roomId] = {[self.owner.blockId] = 1}
+	end
+	local change = self.owner.battle.adv:getCurMap():clearEventById(eventType, eventId, count, exclude)
 	for _, one in ipairs(change) do
 		self.owner.battle.adv:backBlockChange(one[1].roomId, one[2].blockId)
 	end