Commit ce21e3ef authored by mercury233's avatar mercury233

fix

parent cbe15864
...@@ -62,7 +62,7 @@ end ...@@ -62,7 +62,7 @@ end
function c100268007.rmtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c100268007.rmtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local ct=Duel.GetMatchingGroupCount(c100268007.ffilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil) local ct=Duel.GetMatchingGroupCount(c100268007.ffilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
if chkc then return chkc:IsOnField() and chkc:IsAbleToRemove() end if chkc then return chkc:IsOnField() and chkc:IsAbleToRemove() end
if chk==0 then return Duel.IsExistingTarget(Card.IsAbleToRemove,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) end if chk==0 then return ct>0 and Duel.IsExistingTarget(Card.IsAbleToRemove,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local g=Duel.SelectTarget(tp,Card.IsAbleToRemove,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,ct,nil) local g=Duel.SelectTarget(tp,Card.IsAbleToRemove,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,ct,nil)
Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,#g,0,0) Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,#g,0,0)
......
...@@ -67,24 +67,19 @@ function c100311051.negop(e,tp,eg,ep,ev,re,r,rp) ...@@ -67,24 +67,19 @@ function c100311051.negop(e,tp,eg,ep,ev,re,r,rp)
end end
function c100311051.rmcon(e,tp,eg,ep,ev,re,r,rp) function c100311051.rmcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local tc=Duel.GetAttacker() local bc=c:GetBattleTarget()
if tc==c then tc=Duel.GetAttackTarget() end e:SetLabelObject(bc)
if not tc then return false end return bc and bc:IsStatus(STATUS_BATTLE_DESTROYED) and c:IsStatus(STATUS_OPPO_BATTLE)
return not c:IsStatus(STATUS_BATTLE_DESTROYED) and tc:IsStatus(STATUS_BATTLE_DESTROYED)
end end
function c100311051.rmtg(e,tp,eg,ep,ev,re,r,rp,chk) function c100311051.rmtg(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local bc=e:GetLabelObject()
local tc=Duel.GetAttacker() if chk==0 then return bc:IsAbleToRemove() end
if tc==c then tc=Duel.GetAttackTarget() end Duel.SetOperationInfo(0,CATEGORY_REMOVE,bc,1,0,0)
if chk==0 then return tc:IsAbleToRemove() end
tc:CreateEffectRelation(e)
e:SetLabelObject(tc)
Duel.SetOperationInfo(0,CATEGORY_REMOVE,tc,1,0,0)
end end
function c100311051.rmop(e,tp,eg,ep,ev,re,r,rp) function c100311051.rmop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetLabelObject() local bc=e:GetLabelObject()
if tc:IsRelateToEffect(e) then if bc:IsRelateToBattle() and bc:IsAbleToRemove() then
Duel.Remove(tc,POS_FACEUP,REASON_EFFECT) Duel.Remove(bc,POS_FACEUP,REASON_EFFECT)
end end
end end
function c100311051.descon(e,tp,eg,ep,ev,re,r,rp) function c100311051.descon(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -57,7 +57,7 @@ function c101102069.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -57,7 +57,7 @@ function c101102069.operation(e,tp,eg,ep,ev,re,r,rp)
e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetCode(EFFECT_UPDATE_ATTACK)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
e1:SetValue(e:Getlabel()) e1:SetValue(e:GetLabel())
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
end end
......
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