冒险选择点和建筑

zhouhaihai
1 parent f45d3a7b
Showing 3 changed files with 118 additions and 50 deletions Show diff stats
src/adv/Adv.lua
src/adv/AdvBuff.lua
src/adv/AdvPlayer.lua
@@ -538,7 +538,7 @@ local function clickMonster(self, room, block, params)
 	return true
 end
  
-local function chooseCommon(self, room, block, chooseData, choose)
+local function chooseCommon(self, room, block, chooseData, choose, tag)
 	if not chooseData or not chooseData["button".. choose .."cond"] then return end
  
 	local cond = chooseData["button".. choose .."cond"]:toArray(true, "=")
@@ -589,25 +589,37 @@ local function chooseCommon(self, room, block, chooseData, choose)
 				return true
 			end
 		end,
-	}
-	assert(not cond[1] or checkCond[cond[1]], "error cond, event_[link]chooseCsv id :" .. block.event.id)
+		[7] = function()
+			local buff = self.battle.player:getBuffById(cond[2])
+			if buff and buff:getLayer() >= cond[3] then
+				return true
+			end
+		end,
+		[8] = function()
+			return self:isHaveArtifact(cond[2])
+		end
+ 	}
+	assert(not cond[1] or checkCond[cond[1]], "error cond, event_" .. (tag or "choose") .. "Csv id :" .. block.event.id)
  
 	if cond[1] and not checkCond[cond[1]]() then return end
 	local clearBlock = chooseData.keep ~= 1
 	local effects = chooseData["button".. choose .."effect"]:toTableArray(true)
 	for _, effect in ipairs(effects) do
-		if effect[1] == 1 then
-			local reward = csvdb["event_dropCsv"][effect[2]]["range"]:randWeight(true)
-			effect[2] = reward[1]
-			effect[3] = reward[2]
-		end
-
 		local doEffect = {
 			[1] = function() -- 获得某道具N个
-				self:backReward(self:award({[effect[2]] = effect[3]}, {}))
+				local count = effect[3] or 1
+				local reward = {}
+				for i = 1, count do
+					local item = csvdb["event_dropCsv"][effect[2]]["range"]:randWeight(true)
+					reward[item[1]] = (reward[item[1]] or 0) + item[2]
+				end
+				self:backReward(self:award(reward, {}))
 			end,
 			[2] = function() --获得冒险buff
-				self.battle.player:addBuff(effect[2])
+				local layer = effect[3] or 1
+				for i = 1, layer do
+					self.battle.player:addBuff(effect[2])
+				end
 			end,
 			[3] = function() --发现怪物
 				self:getCurMap():addNewMonsterRand(effect[2], {room, block})
@@ -615,25 +627,74 @@ local function chooseCommon(self, room, block, chooseData, choose)
 			end,
 			[4] = function() --无事发生
 			end,
+			[5] = function() --5=属性枚举=数值;直接增加玩家属性
+				local attr
+				if effect[3] == 0 then
+					attr = "sp"
+				else
+					attr = AttsEnumEx[effect[3]]
+					if not AdvAttsEnum[attr] then return end
+				end
+				self.battle.player:addBaseAttr(attr, effect[4], effect[2])
+			end,
+			[6] = function() -- 商店
+				block:updateEvent({
+					etype = AdvEventType.Trader,
+					id = effect[2]
+				})
+				block:randomEvent()
+				clearBlock = false
+			end,
+			[7] = function() -- 建筑
+				block:updateEvent({
+					etype = AdvEventType.Build,
+					id = effect[2]
+				})
+				block:randomEvent()
+				clearBlock = false
+			end,
+			[8] = function() -- 选择
+				block:updateEvent({
+					etype = AdvEventType.Choose,
+					id = effect[2]
+				})
+				block:randomEvent()
+				clearBlock = false
+			end,
+			[9] = function() -- click
+				block:updateEvent({
+					etype = AdvEventType.Click,
+					id = effect[2]
+				})
+				block:randomEvent()
+				clearBlock = false
+			end,
+			[10] = function() -- 陷阱
+				block:updateEvent({
+					etype = AdvEventType.Trap,
+					id = effect[2]
+				})
+				block:randomEvent()
+				clearBlock = false
+			end,
 			[11] = function()  -- 获得神器
 				self:waitChooseArtifact() --等待获取神器
 			end
 		}
-		assert(doEffect[effect[1]], "error effect, event_[link]chooseCsv id :" .. block.event.id)
+		assert(doEffect[effect[1]], "error effect, event_" .. (tag or "choose") .. "Csv id :" .. block.event.id)
 		doEffect[effect[1]]()
 	end
-	self:checkTask(Adv.TaskType.Choose, 1, block.event.id)
-	self:checkAchievement(Adv.AchievType.Choose, 1, block.event.id)
-	self:checkAdvUnlock(3, block.event.id)
 	return true, clearBlock
 end
  
 local function clickChoose(self, room, block, params)
 	local choose = params.choose
 	local chooseData = csvdb["event_chooseCsv"][block.event.id]
-	local status, clearBlock = chooseCommon(self, room, block, chooseData, choose)
+	local status, clearBlock = chooseCommon(self, room, block, chooseData, choose, "choose")
 	if not status then return end
-
+	self:checkAdvUnlock(3, block.event.id)
+	self:checkTask(Adv.TaskType.Choose, 1, block.event.id)
+	self:checkAchievement(Adv.AchievType.Choose, 1, block.event.id)
 	if clearBlock then
 		block:clear()
 	end
@@ -643,7 +704,7 @@ end
 local function clickLinkChoose(self, room, block, params)
 	local choose = params.choose
 	local chooseData = csvdb["event_linkchooseCsv"][block.event.id]
-	local status, clearBlock = chooseCommon(self, room, block, chooseData, choose)
+	local status, clearBlock = chooseCommon(self, room, block, chooseData, choose, "link")
 	if not status then return end
  
 	-- 完成统计次数
@@ -694,31 +755,14 @@ local function clickTrader(self, room, block, params)
 end
  
 local function clickBuild(self, room, block, params)
-	local buildData = csvdb["event_buildingCsv"][block.event.id]
-	if not buildData then return end-- 偷偷改表了
-	if not block.event.effect then return end -- 没有效果 气人不
-	local clearBlock = true
-	local effect = block.event.effect
-	--todo 效果生效
-	local doEffect = {
-		[1] = function() -- 获得某道具N个
-			self:backReward(self:award({[effect[2]] = effect[3]}, {}))
-		end,
-		[2] = function() --获得冒险buff
-			self.battle.player:addBuff(effect[2])
-		end,
-		[3] = function() --发现怪物
-			self:getCurMap():addNewMonsterRand(effect[2], {room, block})
-			clearBlock = false
-		end,
-		[4] = function() --无事发生
-		end
-	}
-	assert(doEffect[effect[1]], "error effect, event_buildingCsv id :" .. block.event.id)
-	if not self:cost(buildData.required:toNumMap(), {}) then return end
-	doEffect[effect[1]]()
+	local choose = params.choose
+	local chooseData = csvdb["event_buildingCsv"][block.event.id]
+	local status, clearBlock = chooseCommon(self, room, block, chooseData, choose, "build")
+	if not status then return end
+	
 	self:checkTask(Adv.TaskType.Build, 1, block.event.id)
 	self:checkAchievement(Adv.AchievType.Build, 1, block.event.id)
+
 	if clearBlock then
 		block:clear()
 	end
@@ -247,7 +247,7 @@ local BuffFactory = {
  
 	[Buff.CLEAR_BUFF] = function(_Buff)
 		_Buff._init = function(self, data)
-			for _, buff in ipairs(self.buffs) do -- 挂上就清除一下子
+			for _, buff in ipairs(self.owner.buffs) do -- 挂上就清除一下子
 				if not buff.isDel and self:canEffect(buff.id) and not self.isDel then
 					if not buff.isDel and not self.isDel then
 						self:effect()
@@ -629,6 +629,10 @@ function Buff:doEffectChange(effect)
 	return effect * (1 + change)
 end
  
+function Buff:getLayer()
+	return self.layer
+end
+
 function Buff:getDB()
 	local db = {}
 	if self._getDB then
@@ -575,19 +575,39 @@ function Player:addExp(value)
 	local delta = level - self.level
 	if delta > 0 then
 		for attr, _ in pairs(AdvAttsEnum) do
-			if attr == "hp" then
-				self[attr] = self[attr] + self.growth[attr] * delta
-				self._hpMax = self._hpMax + self.growth[attr] * delta
-				self:reSetHpMax()
-			else
-				self["_" .. attr] = self["_" .. attr] + self.growth[attr] * delta
-				self:reSetAttr(attr)
-			end
+			self:addBaseAttr(attr, self.growth[attr] * delta)
 		end
 	end
 	self.level = level
 	self.exp = newExp
 end
+--vtype 0/1 值/%
+function Player:addBaseAttr(attr, value, vtype)
+	local attrName = attr
+	if attr == "hp" then
+		attrName = "hpMax"
+	elseif attr = "sp" then
+		attrName = "spMax"
+	end
+	local baseName = "_" .. attrName
+	if not self[baseName] then return end
+	local oldV = self[baseName]
+
+	local change = value
+	if vtype == 1 then
+		change = oldV * value / 100
+	end
+	self[baseName] = self[baseName] + change
+	if attr == "hp" then
+		self.hp = self.hp + change
+		self:reSetHpMax()
+	elseif attr == "sp" then
+		self.sp = self.sp + change
+		self:reSetSpMax()
+	else
+		self:reSetAttr(attr)
+	end
+end
  
 --cType 0 or nil  值  1 百分比
 function Player:changeSp(value, cType)