Commit 3d5b33aa authored by POLYMER's avatar POLYMER

fix

parent 16532171
...@@ -26,6 +26,7 @@ function c22021330.initial_effect(c) ...@@ -26,6 +26,7 @@ function c22021330.initial_effect(c)
e3:SetDescription(aux.Stringid(22021330,1)) e3:SetDescription(aux.Stringid(22021330,1))
e3:SetCategory(CATEGORY_DESTROY) e3:SetCategory(CATEGORY_DESTROY)
e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e3:SetCode(EVENT_CHAINING)
e3:SetRange(LOCATION_MZONE) e3:SetRange(LOCATION_MZONE)
e3:SetProperty(EFFECT_FLAG_DELAY) e3:SetProperty(EFFECT_FLAG_DELAY)
e3:SetCountLimit(1,22021331) e3:SetCountLimit(1,22021331)
...@@ -34,8 +35,8 @@ function c22021330.initial_effect(c) ...@@ -34,8 +35,8 @@ function c22021330.initial_effect(c)
e3:SetOperation(c22021330.desop) e3:SetOperation(c22021330.desop)
c:RegisterEffect(e3) c:RegisterEffect(e3)
end end
function c22021330.lcheck(g,lc) function c22021330.lcheck(g)
return g:GetClassCount(Card.GetLinkCode)==g:GetCount() return g:IsExists(Card.IsLinkSetCard,1,nil,0xff9)
end end
function c22021330.valcheck(e,c) function c22021330.valcheck(e,c)
local g=c:GetMaterial() local g=c:GetMaterial()
......
...@@ -51,7 +51,7 @@ function c43990034.dtop(e,tp,eg,ep,ev,re,r,rp) ...@@ -51,7 +51,7 @@ function c43990034.dtop(e,tp,eg,ep,ev,re,r,rp)
end end
function c43990034.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c43990034.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsFaceup() end if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsFaceup() end
if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) and Duel.GetLocationCount(tp,LOCATION_SZONE)>0 and Duel.IsExistingMatchingCard(c43990034.eqfilter,tp,LOCATION_DECK,0,1,nil) end if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) and Duel.GetLocationCount(tp,LOCATION_SZONE)>1 and Duel.IsExistingMatchingCard(c43990034.eqfilter,tp,LOCATION_DECK,0,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
local g=Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil) local g=Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
Duel.SetOperationInfo(0,CATEGORY_EQUIP,e:GetHandler(),1,0,0) Duel.SetOperationInfo(0,CATEGORY_EQUIP,e:GetHandler(),1,0,0)
......
...@@ -8,7 +8,7 @@ function cm.initial_effect(c) ...@@ -8,7 +8,7 @@ function cm.initial_effect(c)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE) e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE)
e1:SetTarget(c43990039.thtg) e1:SetTarget(c43990039.tgtg)
e1:SetOperation(c43990039.tgop) e1:SetOperation(c43990039.tgop)
c:RegisterEffect(e1) c:RegisterEffect(e1)
--Activate --Activate
...@@ -23,16 +23,16 @@ function cm.initial_effect(c) ...@@ -23,16 +23,16 @@ function cm.initial_effect(c)
e2:SetOperation(c43990039.thop) e2:SetOperation(c43990039.thop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function c43990039.thfilter(c) function c43990039.tgfilter(c)
return c:IsSetCard(0x1514) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand() return c:IsSetCard(0x1514) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()
end end
function c43990039.thtg(e,tp,eg,ep,ev,re,r,rp,chk) function c43990039.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c43990039.thfilter,tp,LOCATION_DECK,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(c43990039.tgfilter,tp,LOCATION_DECK,0,1,nil) end
Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK) Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
end end
function c43990039.tgop(e,tp,eg,ep,ev,re,r,rp) function c43990039.tgop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(tp,c43990039.thfilter,tp,LOCATION_DECK,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,c43990039.tgfilter,tp,LOCATION_DECK,0,1,1,nil)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
......
--海造贼--新生之集结号 --海造贼--新生之集结号
function c67642779.initial_effect(c) function c67642779.initial_effect(c)
--xyz summon --xyz summon
aux.AddXyzProcedureLevelFree(c,c67642779.mfilter,c67642779.xyzcheck,3,99) aux.AddXyzProcedureLevelFree(c,c67642779.mfilter,c67642779.xyzcheck,2,99)
c:EnableReviveLimit() c:EnableReviveLimit()
--pendulum summon --pendulum summon
aux.EnablePendulumAttribute(c,false) aux.EnablePendulumAttribute(c,false)
......
...@@ -9,7 +9,7 @@ function c97647362.initial_effect(c) ...@@ -9,7 +9,7 @@ function c97647362.initial_effect(c)
e1:SetProperty(EFFECT_FLAG_CARD_TARGET) e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
e1:SetType(EFFECT_TYPE_IGNITION) e1:SetType(EFFECT_TYPE_IGNITION)
e1:SetRange(LOCATION_PZONE) e1:SetRange(LOCATION_PZONE)
e1:SetCountLimit(1,97647362) e1:SetCountLimit(1,97647362*1)
e1:SetTarget(c97647362.sptg) e1:SetTarget(c97647362.sptg)
e1:SetOperation(c97647362.spop) e1:SetOperation(c97647362.spop)
c:RegisterEffect(e1) c:RegisterEffect(e1)
...@@ -26,7 +26,8 @@ function c97647362.initial_effect(c) ...@@ -26,7 +26,8 @@ function c97647362.initial_effect(c)
e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e3:SetProperty(EFFECT_FLAG_DELAY) e3:SetProperty(EFFECT_FLAG_DELAY)
e3:SetCode(EVENT_TO_GRAVE) e3:SetCode(EVENT_TO_GRAVE)
e3:SetCountLimit(1,97647363) e3:SetCountLimit(1,97647362*2)
e3:SetCondition(c97647362.thcon2)
e3:SetTarget(c97647362.thtg2) e3:SetTarget(c97647362.thtg2)
e3:SetOperation(c97647362.thop2) e3:SetOperation(c97647362.thop2)
c:RegisterEffect(e3) c:RegisterEffect(e3)
...@@ -74,6 +75,9 @@ function c97647362.rlevel(e,c) ...@@ -74,6 +75,9 @@ function c97647362.rlevel(e,c)
return (lv<<16)+clv return (lv<<16)+clv
else return lv end else return lv end
end end
function c97647362.thcon2(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsPreviousLocation(LOCATION_HAND)
end
function c97647362.thfilter2(c) function c97647362.thfilter2(c)
return c:IsSetCard(0x13f) and c:IsType(TYPE_MONSTER) and not c:IsCode(97647362) and c:IsAbleToHand() return c:IsSetCard(0x13f) and c:IsType(TYPE_MONSTER) and not c:IsCode(97647362) and c:IsAbleToHand()
end end
......
...@@ -8,7 +8,7 @@ function c98769900.initial_effect(c) ...@@ -8,7 +8,7 @@ function c98769900.initial_effect(c)
e1:SetCategory(CATEGORY_SEARCH+CATEGORY_TOHAND) e1:SetCategory(CATEGORY_SEARCH+CATEGORY_TOHAND)
e1:SetType(EFFECT_TYPE_IGNITION) e1:SetType(EFFECT_TYPE_IGNITION)
e1:SetRange(LOCATION_PZONE) e1:SetRange(LOCATION_PZONE)
e1:SetCountLimit(1,98769900) e1:SetCountLimit(1,98769900*1)
e1:SetCondition(c98769900.thcon1) e1:SetCondition(c98769900.thcon1)
e1:SetTarget(c98769900.thtg1) e1:SetTarget(c98769900.thtg1)
e1:SetOperation(c98769900.thop1) e1:SetOperation(c98769900.thop1)
...@@ -21,7 +21,7 @@ function c98769900.initial_effect(c) ...@@ -21,7 +21,7 @@ function c98769900.initial_effect(c)
e2:SetCode(EVENT_FREE_CHAIN) e2:SetCode(EVENT_FREE_CHAIN)
e2:SetRange(LOCATION_MZONE) e2:SetRange(LOCATION_MZONE)
e2:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE) e2:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE)
e2:SetCountLimit(1,98769901) e2:SetCountLimit(1,98769900*2)
e2:SetCondition(c98769900.spcon) e2:SetCondition(c98769900.spcon)
e2:SetTarget(c98769900.sptg) e2:SetTarget(c98769900.sptg)
e2:SetOperation(c98769900.spop) e2:SetOperation(c98769900.spop)
...@@ -33,7 +33,8 @@ function c98769900.initial_effect(c) ...@@ -33,7 +33,8 @@ function c98769900.initial_effect(c)
e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e3:SetProperty(EFFECT_FLAG_DELAY) e3:SetProperty(EFFECT_FLAG_DELAY)
e3:SetCode(EVENT_TO_GRAVE) e3:SetCode(EVENT_TO_GRAVE)
e3:SetCountLimit(1,98769902) e3:SetCountLimit(1,98769900*3)
e3:SetCondition(c98769900.thcon2)
e3:SetTarget(c98769900.thtg2) e3:SetTarget(c98769900.thtg2)
e3:SetOperation(c98769900.thop2) e3:SetOperation(c98769900.thop2)
c:RegisterEffect(e3) c:RegisterEffect(e3)
...@@ -108,6 +109,9 @@ end ...@@ -108,6 +109,9 @@ end
function c98769900.thcon2(e,tp,eg,ep,ev,re,r,rp) function c98769900.thcon2(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():GetFlagEffect(98769900)~=0 return e:GetHandler():GetFlagEffect(98769900)~=0
end end
function c98769900.thcon2(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsPreviousLocation(LOCATION_HAND)
end
function c98769900.thfilter2(c) function c98769900.thfilter2(c)
return c:IsSetCard(0x13f) and c:IsType(TYPE_MONSTER) and not c:IsCode(98769900) and c:IsAbleToHand() return c:IsSetCard(0x13f) and c:IsType(TYPE_MONSTER) and not c:IsCode(98769900) and c:IsAbleToHand()
end end
......
...@@ -26,7 +26,7 @@ function c99953655.initial_effect(c) ...@@ -26,7 +26,7 @@ function c99953655.initial_effect(c)
e2:SetCountLimit(1,99953656) e2:SetCountLimit(1,99953656)
e2:SetCondition(c99953655.rmcon1) e2:SetCondition(c99953655.rmcon1)
e2:SetCost(c99953655.rmcost) e2:SetCost(c99953655.rmcost)
e2:SetTarget(c99953655.rthtg) e2:SetTarget(c99953655.rmtg)
e2:SetOperation(c99953655.rmop) e2:SetOperation(c99953655.rmop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
local e3=e2:Clone() local e3=e2:Clone()
...@@ -71,40 +71,25 @@ function c99953655.costfilter(c) ...@@ -71,40 +71,25 @@ function c99953655.costfilter(c)
end end
function c99953655.rmcost(e,tp,eg,ep,ev,re,r,rp,chk) function c99953655.rmcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c99953655.costfilter,tp,LOCATION_HAND,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(c99953655.costfilter,tp,LOCATION_HAND,0,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISCARD) Duel.DiscardHand(tp,c99953655.costfilter,1,1,REASON_COST+REASON_DISCARD)
local g=Duel.SelectMatchingCard(tp,c99953655.costfilter,tp,LOCATION_HAND,0,1,1,nil)
Duel.SendtoGrave(g,REASON_COST+REASON_DISCARD)
end end
function c99953655.rthtgfilter(c,tc) function c99953655.rmfilter(c,tc)
return c:IsAbleToHand() and c:GetEquipTarget()~=tc return c:IsAbleToHand()
end end
function c99953655.rthtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c99953655.rmtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local c=e:GetHandler() if chkc then return chkc:IsLocation(LOCATION_ONFIELD) and chkc:IsControler(1-tp) and c99953655.rmfilter(chkc) end
if chkc then return chkc:IsControler(1-tp) and chkc:IsOnField() and chkc:IsAbleToHand() end if chk==0 then return Duel.IsExistingTarget(c99953655.rmfilter,tp,0,LOCATION_ONFIELD,1,nil) end
if chk==0 then
if e:GetLabel()==1 then
e:SetLabel(0)
return Duel.IsExistingMatchingCard(c99953655.costfilter,tp,LOCATION_ONFIELD,0,1,c,tp)
else
return Duel.IsExistingTarget(Card.IsAbleToHand,tp,0,LOCATION_ONFIELD,1,nil)
end
end
if e:GetLabel()==1 then
e:SetLabel(0)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
local g=Duel.SelectMatchingCard(tp,c99953655.costfilter,tp,LOCATION_ONFIELD,0,1,1,c,tp)
Duel.SendtoHand(g,nil,REASON_COST)
end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
local g=Duel.SelectTarget(tp,Card.IsAbleToHand,tp,0,LOCATION_ONFIELD,1,1,nil) local g=Duel.SelectTarget(tp,c99953655.rmfilter,tp,0,LOCATION_ONFIELD,1,1,nil)
Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)
Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,0,tp,LOCATION_DECK)
end end
function c99953655.thfilter(c) function c99953655.thfilter(c)
return c:IsSetCard(0x13f) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand() return c:IsSetCard(0x13f) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
end end
function c99953655.rmop(e,tp,eg,ep,ev,re,r,rp) function c99953655.rmop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) and Duel.SendtoHand(tc,POS_FACEUP,REASON_EFFECT)~=0 and Duel.IsExistingMatchingCard(c99953655.thfilter,tp,LOCATION_DECK,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(94253655,1)) then if tc:IsRelateToEffect(e) and Duel.SendtoHand(tc,nil,REASON_EFFECT)~=0 and tc:IsLocation(LOCATION_HAND) and Duel.IsExistingMatchingCard(c99953655.thfilter,tp,LOCATION_DECK,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(94253655,1)) then
Duel.BreakEffect() Duel.BreakEffect()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(tp,c99953655.thfilter,tp,LOCATION_DECK,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,c99953655.thfilter,tp,LOCATION_DECK,0,1,1,nil)
......
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