Commit 97822a10 authored by POLYMER's avatar POLYMER

fix

parent cf637895
...@@ -81,7 +81,7 @@ function c11533700.rrtop(e,tp,eg,ep,ev,re,r,rp) ...@@ -81,7 +81,7 @@ function c11533700.rrtop(e,tp,eg,ep,ev,re,r,rp)
local b1=Duel.IsExistingMatchingCard(c11533700.rrfil1,tp,LOCATION_HAND,0,1,c) and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_GRAVE+LOCATION_REMOVED,LOCATION_GRAVE+LOCATION_REMOVED,5,nil) and Duel.IsPlayerCanDraw(tp,2) local b1=Duel.IsExistingMatchingCard(c11533700.rrfil1,tp,LOCATION_HAND,0,1,c) and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_GRAVE+LOCATION_REMOVED,LOCATION_GRAVE+LOCATION_REMOVED,5,nil) and Duel.IsPlayerCanDraw(tp,2)
local b2=Duel.IsExistingMatchingCard(c11533700.rrfil2,tp,LOCATION_GRAVE,0,1,c) and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_GRAVE+LOCATION_REMOVED,LOCATION_GRAVE+LOCATION_REMOVED,3,nil) and Duel.IsPlayerCanDraw(tp,1) local b2=Duel.IsExistingMatchingCard(c11533700.rrfil2,tp,LOCATION_GRAVE,0,1,c) and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_GRAVE+LOCATION_REMOVED,LOCATION_GRAVE+LOCATION_REMOVED,3,nil) and Duel.IsPlayerCanDraw(tp,1)
local op=0 local op=0
if b1 and b2 then if b1 or b2 then
op=Duel.SelectOption(tp,aux.Stringid(11533700,2),aux.Stringid(11533700,3)) op=Duel.SelectOption(tp,aux.Stringid(11533700,2),aux.Stringid(11533700,3))
elseif b1 then elseif b1 then
op=Duel.SelectOption(tp,aux.Stringid(11533700,2)) op=Duel.SelectOption(tp,aux.Stringid(11533700,2))
......
...@@ -76,7 +76,7 @@ function s.tscon(e,tp,eg,ep,ev,re,r,rp) ...@@ -76,7 +76,7 @@ function s.tscon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
return c:IsPreviousLocation(LOCATION_ONFIELD) return c:IsPreviousLocation(LOCATION_ONFIELD)
end end
function s.tsfilter(c) function s.tsfilter(c,tp)
return c:IsSetCard(0x541a) and c:IsType(TYPE_MONSTER) and c:IsFaceup() and c:IsAbleToRemove() and return c:IsSetCard(0x541a) and c:IsType(TYPE_MONSTER) and c:IsFaceup() and c:IsAbleToRemove() and
Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,c:GetCode()) Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,c:GetCode())
end end
...@@ -84,13 +84,13 @@ function s.thfilter(c,code) ...@@ -84,13 +84,13 @@ function s.thfilter(c,code)
return c:IsSetCard(0x541a) and not c:IsCode(code) and (c:IsAbleToHand() or c:IsAbleToGrave()) return c:IsSetCard(0x541a) and not c:IsCode(code) and (c:IsAbleToHand() or c:IsAbleToGrave())
end end
function s.tstg(e,tp,eg,ep,ev,re,r,rp,chk) function s.tstg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(s.tsfilter,tp,LOCATION_EXTRA,0,1,e:GetHandler()) end if chk==0 then return Duel.IsExistingMatchingCard(s.tsfilter,tp,LOCATION_EXTRA,0,1,e:GetHandler(),tp) end
Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK) Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
end end
function s.tsop(e,tp,eg,ep,ev,re,r,rp) function s.tsop(e,tp,eg,ep,ev,re,r,rp)
if not Duel.IsExistingMatchingCard(s.tsfilter,tp,LOCATION_EXTRA,0,1,e:GetHandler()) then return end if not Duel.IsExistingMatchingCard(s.tsfilter,tp,LOCATION_EXTRA,0,1,e:GetHandler(),tp) then return end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local g=Duel.SelectMatchingCard(tp,s.tsfilter,tp,LOCATION_EXTRA,0,1,1,e:GetHandler()) local g=Duel.SelectMatchingCard(tp,s.tsfilter,tp,LOCATION_EXTRA,0,1,1,e:GetHandler(),tp)
local tc=g:GetFirst() local tc=g:GetFirst()
if Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)~=0 then if Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)~=0 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
......
...@@ -33,7 +33,7 @@ function c67200756.initial_effect(c) ...@@ -33,7 +33,7 @@ function c67200756.initial_effect(c)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function c67200756.cfilter(c) function c67200756.cfilter(c)
return c:IsFaceup() and c:IsSetCard(0x67d) and c:IsType(TYPE_LINK) return c:IsFaceup() and c:IsSetCard(0x367d) and c:IsType(TYPE_LINK)
end end
function c67200756.condition(e,tp,eg,ep,ev,re,r,rp) function c67200756.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(c67200756.cfilter,tp,LOCATION_MZONE,0,1,nil) return Duel.IsExistingMatchingCard(c67200756.cfilter,tp,LOCATION_MZONE,0,1,nil)
...@@ -43,7 +43,7 @@ function c67200756.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -43,7 +43,7 @@ function c67200756.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true end
Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0) Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0)
end end
function c67200756.operation(e,tp,eg,ep,ev,re,r,rp) function c67200756.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.NegateActivation(ev) Duel.NegateActivation(ev)
end end
-- --
......
...@@ -144,7 +144,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -144,7 +144,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
e1:SetCode(EFFECT_EQUIP_LIMIT) e1:SetCode(EFFECT_EQUIP_LIMIT)
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(cm.eqlimit) e1:SetValue(cm.eqlimit2)
e1:SetLabelObject(tc) e1:SetLabelObject(tc)
sc:RegisterEffect(e1) sc:RegisterEffect(e1)
end end
...@@ -154,4 +154,7 @@ end ...@@ -154,4 +154,7 @@ end
function cm.eqlimit(e,c) function cm.eqlimit(e,c)
return e:GetOwner()==c return e:GetOwner()==c
end end
function cm.eqlimit2(e,c)
return e:GetLabelObject()==c
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