Commit 10b125f5 authored by DailyShana's avatar DailyShana Committed by GitHub

fix double piercing damage (#1285)

parent 30538e19
...@@ -10,14 +10,8 @@ function c28016193.initial_effect(c) ...@@ -10,14 +10,8 @@ function c28016193.initial_effect(c)
e1:SetRange(LOCATION_MZONE) e1:SetRange(LOCATION_MZONE)
e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTargetRange(LOCATION_MZONE,0)
e1:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0xe1)) e1:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0xe1))
e1:SetValue(DOUBLE_DAMAGE)
c:RegisterEffect(e1) c:RegisterEffect(e1)
local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e2:SetCode(EVENT_PRE_BATTLE_DAMAGE)
e2:SetRange(LOCATION_MZONE)
e2:SetCondition(c28016193.damcon)
e2:SetOperation(c28016193.damop)
c:RegisterEffect(e2)
--destroy --destroy
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetCategory(CATEGORY_DESTROY) e3:SetCategory(CATEGORY_DESTROY)
...@@ -29,13 +23,6 @@ function c28016193.initial_effect(c) ...@@ -29,13 +23,6 @@ function c28016193.initial_effect(c)
e3:SetOperation(c28016193.desop) e3:SetOperation(c28016193.desop)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function c28016193.damcon(e,tp,eg,ep,ev,re,r,rp)
local tc=eg:GetFirst()
return ep~=tp and tc:IsSetCard(0xe1) and tc:GetBattleTarget()~=nil and tc:GetBattleTarget():IsDefensePos()
end
function c28016193.damop(e,tp,eg,ep,ev,re,r,rp)
Duel.ChangeBattleDamage(ep,ev*2)
end
function c28016193.descon(e,tp,eg,ep,ev,re,r,rp) function c28016193.descon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD) return e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD)
end end
......
...@@ -28,18 +28,6 @@ function c55410871.initial_effect(c) ...@@ -28,18 +28,6 @@ function c55410871.initial_effect(c)
local e4=Effect.CreateEffect(c) local e4=Effect.CreateEffect(c)
e4:SetType(EFFECT_TYPE_SINGLE) e4:SetType(EFFECT_TYPE_SINGLE)
e4:SetCode(EFFECT_PIERCE) e4:SetCode(EFFECT_PIERCE)
e4:SetValue(DOUBLE_DAMAGE)
c:RegisterEffect(e4) c:RegisterEffect(e4)
local e5=Effect.CreateEffect(c)
e5:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
e5:SetCode(EVENT_PRE_BATTLE_DAMAGE)
e5:SetCondition(c55410871.damcon)
e5:SetOperation(c55410871.damop)
c:RegisterEffect(e5)
end
function c55410871.damcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
return ep~=tp and c==Duel.GetAttacker() and Duel.GetAttackTarget() and Duel.GetAttackTarget():IsDefensePos()
end
function c55410871.damop(e,tp,eg,ep,ev,re,r,rp)
Duel.ChangeBattleDamage(ep,ev*2)
end end
...@@ -682,6 +682,9 @@ OPCODE_ISSETCARD =0x40000101 ...@@ -682,6 +682,9 @@ OPCODE_ISSETCARD =0x40000101
OPCODE_ISTYPE =0x40000102 OPCODE_ISTYPE =0x40000102
OPCODE_ISRACE =0x40000103 OPCODE_ISRACE =0x40000103
OPCODE_ISATTRIBUTE =0x40000104 OPCODE_ISATTRIBUTE =0x40000104
--
DOUBLE_DAMAGE =0x80000000
HALF_DAMAGE =0x80000001
--Hint Message --提示消息,显示在窗口的上面 --Hint Message --提示消息,显示在窗口的上面
HINTMSG_RELEASE =500 --请选择要解放的卡 HINTMSG_RELEASE =500 --请选择要解放的卡
HINTMSG_DISCARD =501 --请选择要丢弃的手牌 HINTMSG_DISCARD =501 --请选择要丢弃的手牌
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment