冒险 buff 类型 34 35

zhouhaihai
1 parent e1b238dd
Showing 4 changed files with 48 additions and 1 deletions Show diff stats
src/adv/AdvBlock.lua
src/adv/AdvBuff.lua
src/adv/AdvMap.lua
src/adv/AdvPlayer.lua
@@ -209,6 +209,13 @@ function Block:randomEvent()
 					e:addBuff(buffId)
 				end
 			end
+		elseif data.target == 4 then
+			local enemys = self.room.map.adv:getCurMap():openBlocksIsMonsterByRoom(self.room.roomId)
+			for _, e in ipairs(enemys) do
+				for _, buffId in ipairs(buffs) do
+					e:addBuff(buffId)
+				end
+			end
 		end
 		if data.specialEff ~= "" then
@@ -279,6 +286,10 @@ function Block:quickDrop()
 end
 function Block:getObstacle()
+	if self:isMonster() then
+		local enemy = self.room.map.adv.battle:getEnemy(self.room.roomId, self.blockId)
+		return enemy:getObstacle()
+	end
 	local data = self:getEventData()
 	if not data then return 0 end
 	return data.obstacle or 0
@@ -34,6 +34,8 @@ Buff.Buff_EFFECT_CHANGE = 30 -- 改变 buff 效果
 Buff.Buff_NO_PASSIVE_MONSTER = 31 -- 地图被动刷新不出来怪物
 Buff.SNEAK = 32 --潜行
 Buff.DROP_BUFF_BY_ENEMY = 33 -- 怪物掉落加成  -- 怪物使用
+Buff.GET_PASSIVE = 34 -- 获得 passive -- 结束失效
+Buff.OBSTACLE_CHANGE = 35 -- 看守类型改变  -- 怪物使用  0 - 1
 --角色一些属性的变化
@@ -378,6 +380,14 @@ local BuffFactory = {
 			self.layer = self.buffData.effectValue1
 		end
 	end,
+	[Buff.GET_PASSIVE] = function( _Buff )
+		_Buff._init = function(self)
+			self.owner:addPassive({id = self.buffData.effectValue1})
+		end
+		_Buff._endBuff = function(self)
+			self.owner:delPassiveById(self.buffData.effectValue1)
+		end
+	end
 }
 -- 同样的返回  effectValue1, effectValue2 * self.layer 类型的buff
@@ -272,8 +272,8 @@ function Map:openBlock(roomId, blockId, isPlayer, ignoreBack)
 		if not ignoreBack then
 			self.adv:backBlockChange(roomId, blockId)
 		end
-
 	end
+	return status
 end
 function Map:openBlocksBySize(roomId, blockId, size, isPlayer, ignoreBack)
@@ -292,6 +292,24 @@ function Map:openBlocksByRoom(roomId, isPlayer, ignoreBack)
 	end
 end
+function Map:openBlocksIsMonsterByRoom(roomId, isPlayer, ignoreBack)
+	local room = self.rooms[roomId]
+	if not room then return end 
+
+	local enemys = {}
+	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
+			end
+		end
+	end
+	return enemys
+end
+
 function Map:openAllBlocks(isPlayer, ignoreBack)
 	for roomId, room in pairs(self.rooms) do
 		self:openBlocksByRoom(room.roomId, isPlayer, ignoreBack)
@@ -557,6 +557,14 @@ function Enemy:isEnemy()
 	return true
 end
+function Enemy:getObstacle()
+	local obstacle = csvdb["event_monsterCsv"][self.monsterId].obstacle
+	if obstacle == 0 and self:hadBuff(Buff.OBSTACLE_CHANGE) then
+		obstacle = 1
+	end
+	return obstacle
+end
+
 function Enemy:kill()
 	self:hurt(self.hp, self.battle.player, {hurtType = 5})
 end