diff --git a/src/adv/AdvBuff.lua b/src/adv/AdvBuff.lua index f6810b0..4250032 100644 --- a/src/adv/AdvBuff.lua +++ b/src/adv/AdvBuff.lua @@ -95,7 +95,6 @@ local function commonAttCond(_Buff, attrName) end _Buff._effectValue = function(self) - print(self:_calculate() * self.layer) return self.buffData.effectValue1, self:_calculate() * self.layer, attrName end @@ -230,7 +229,6 @@ local BuffFactory = { elseif self.buffData.effectValue1 == 2 then dispel = buffData.classify:sismember(self.buffData.effectValue2, " ") end - return dispel end end, diff --git a/src/adv/AdvPlayer.lua b/src/adv/AdvPlayer.lua index 15ba5b4..8bbf3f8 100644 --- a/src/adv/AdvPlayer.lua +++ b/src/adv/AdvPlayer.lua @@ -152,6 +152,7 @@ function BaseObject:addBuff(buffId, releaser) end self:triggerPassive(Passive.GET_BUFF, {buffId = buffId}) self.battle.adv:backBuff(self.monsterId, buffId) + return true end function BaseObject:getBuffById(bId) @@ -647,9 +648,12 @@ function Player:afterLayer() end function Player:addBuff(buffId, releaser) - Player.super.addBuff(self, buffId, releaser) - self.battle.player:attrChangeCondBuffCheck(2, buffId) - self.battle.adv:checkAchievement(self.battle.adv.AchievType.GetBuff, 1, buffId) + local status = Player.super.addBuff(self, buffId, releaser) + if status then + self.battle.player:attrChangeCondBuffCheck(2, buffId) + self.battle.adv:checkAchievement(self.battle.adv.AchievType.GetBuff, 1, buffId) + end + return status end function Player:attrChangeCondBuffCheck(etype, cond) @@ -663,7 +667,6 @@ function Player:attrChangeCondBuffCheck(etype, cond) end end - dump(effect) for attrName, _ in pairs(effect) do if attrName == "hp" then self:reSetHpMax() diff --git a/src/utils/StringUtil.lua b/src/utils/StringUtil.lua index 62d0a43..af05651 100644 --- a/src/utils/StringUtil.lua +++ b/src/utils/StringUtil.lua @@ -269,7 +269,7 @@ v1;v2;v3; function string.sismember(str, value, delimiter) delimiter = delimiter or ";" for _, v in ipairs(str:toArray(true, delimiter)) do - if v == val then + if v == value then return true end end -- libgit2 0.21.2