Commit d7e0ac93 authored by POLYMER's avatar POLYMER

fix

parent 23aa4124
......@@ -91,7 +91,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
local off=1
local ops={}
local opval={}
local b1=e:GetLabel()&(0x8-0x1)>0
local b1=e:GetLabel()&(0x8-0x1)>0 and re:GetHandler():IsStatus(STATUS_CHAINING)
local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b3=e:GetLabel()&(0x200-0x40)>0 and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove()
local b4=e:GetLabel()&(0x1000-0x200)>0
......
......@@ -82,8 +82,8 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
end
function cm.activate(e,tp,eg,ep,ev,re,r,rp)
local te=e:GetLabelObject()
if te and aux.GetValueType(te)=="Effect" and te:GetHandler():IsRelateToEffect(e) and Duel.SendtoDeck(te:GetHandler(),nil,2,REASON_EFFECT)>0 then
if te:GetHandler():IsLocation(LOCATION_DECK) then Duel.ShuffleDeck(tp) end
if te and aux.GetValueType(te)=="Effect" and te:GetHandler():IsRelateToEffect(e) and Duel.SendtoDeck(te:GetHandler(),nil,2,REASON_EFFECT)>0 and te:GetHandler():IsLocation(LOCATION_DECK+LOCATION_EXTRA) then
Duel.ShuffleDeck(tp)
e:SetLabelObject(te:GetLabelObject())
local op=te:GetOperation()
if op then op(e,tp,eg,ep,ev,re,r,rp) end
......@@ -106,7 +106,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
local off=1
local ops={}
local opval={}
local b1=e:GetLabel()&(0x8-0x1)>0
local b1=e:GetLabel()&(0x8-0x1)>0 and re:GetHandler():IsStatus(STATUS_CHAINING)
local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b3=e:GetLabel()&(0x200-0x40)>0 and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove()
local b4=e:GetLabel()&(0x1000-0x200)>0
......
......@@ -125,7 +125,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
local off=1
local ops={}
local opval={}
local b1=e:GetLabel()&(0x8-0x1)>0
local b1=e:GetLabel()&(0x8-0x1)>0 and re:GetHandler():IsStatus(STATUS_CHAINING)
local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b3=e:GetLabel()&(0x200-0x40)>0 and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove()
local b4=e:GetLabel()&(0x1000-0x200)>0
......
......@@ -92,7 +92,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
local off=1
local ops={}
local opval={}
local b1=e:GetLabel()&(0x8-0x1)>0
local b1=e:GetLabel()&(0x8-0x1)>0 and re:GetHandler():IsStatus(STATUS_CHAINING)
local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b3=e:GetLabel()&(0x200-0x40)>0 and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove()
local b4=e:GetLabel()&(0x1000-0x200)>0
......
......@@ -123,7 +123,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
local off=1
local ops={}
local opval={}
local b1=e:GetLabel()&(0x8-0x1)>0
local b1=e:GetLabel()&(0x8-0x1)>0 and re:GetHandler():IsStatus(STATUS_CHAINING)
local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b3=e:GetLabel()&(0x200-0x40)>0 and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove()
local b4=e:GetLabel()&(0x1000-0x200)>0
......
......@@ -203,7 +203,7 @@ function cm.addition(e,tp,eg,ep,ev,re,r,rp)
local off=1
local ops={}
local opval={}
local b1=e:GetLabel()&(0x8-0x1)>0
local b1=e:GetLabel()&(0x8-0x1)>0 and re:GetHandler():IsStatus(STATUS_CHAINING)
local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b3=e:GetLabel()&(0x200-0x40)>0 and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove()
local b4=e:GetLabel()&(0x1000-0x200)>0
......
......@@ -197,7 +197,7 @@ function cm.LinkOperation(f,minc,maxc,gf)
e4:SetType(EFFECT_TYPE_FIELD)
e4:SetCode(EFFECT_ACTIVATE_COST)
--e4:SetRange(LOCATION_SZONE)
e4:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e4:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_UNCOPYABLE)
e4:SetTargetRange(1,0)
e4:SetTarget(function(e,te,tp) e:SetLabelObject(te) return te==e1 or te==e2 end) --oc==te:GetHandler() and te:IsHasType(EFFECT_TYPE_QUICK_F) end)
e4:SetOperation(cm.costop)
......
......@@ -19,7 +19,7 @@ function cm.initial_effect(c)
e2:SetCode(EVENT_LEAVE_FIELD)
e2:SetRange(LOCATION_HAND+LOCATION_GRAVE)
e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL+EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
e1:SetCountLimit(1,70010059)
e2:SetCountLimit(1,70010059)
e2:SetCondition(c60010059.condition)
e2:SetTarget(c60010059.target)
e2:SetOperation(c60010059.operation)
......
......@@ -68,6 +68,7 @@ function c9310055.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
local g=Duel.SelectMatchingCard(tp,c9310055.disfilter,tp,LOCATION_ONFIELD,0,1,1,nil)
if Duel.SendtoHand(g,nil,REASON_EFFECT)~=0 then
if not re:GetHandler():IsStatus(STATUS_CHAINING) then return end
Duel.NegateActivation(ev)
end
end
......@@ -87,7 +88,7 @@ function c9310055.addition(e,tp,eg,ep,ev,re,r,rp)
local off=1
local ops={}
local opval={}
local b1=e:GetLabel()&(0x8-0x1)>0
local b1=e:GetLabel()&(0x8-0x1)>0 and re:GetHandler():IsStatus(STATUS_CHAINING)
local b2=e:GetLabel()&(0x40-0x8)>0 and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
local b3=e:GetLabel()&(0x200-0x40)>0 and re:GetHandler():IsRelateToEffect(re) and re:GetHandler():IsAbleToRemove()
local b4=e:GetLabel()&(0x1000-0x200)>0
......
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