Skip to content

Commit e6f6465

Browse files
NaimSantosNaimSantos
committed
Use Card.IsSpell and Card.IsTrap
1 parent d6c6024 commit e6f6465

38 files changed

+67
-73
lines changed

‎goat/c504700042.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ end
1111
s.listed_names={CARD_NECROVALLEY}
1212
function s.operation(e,tp,eg,ep,ev,re,r,rp)
1313
Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(id,1))
14-
local g=Duel.SelectMatchingCard(tp,Card.IsType,tp,LOCATION_DECK,0,1,1,nil,TYPE_TRAP)
14+
local g=Duel.SelectMatchingCard(tp,Card.IsTrap,tp,LOCATION_DECK,0,1,1,nil)
1515
local tc=g:GetFirst()
1616
if tc then
1717
if Duel.IsEnvironment(CARD_NECROVALLEY) and tc:IsAbleToHand() and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then

‎goat/c504700087.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,4 +79,4 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp)
7979
elseif e:GetLabel()==1 then g=Duel.SelectMatchingCard(1-tp,s.tgfilter,1-tp,LOCATION_DECK,0,1,1,nil,TYPE_SPELL)
8080
else g=Duel.SelectMatchingCard(1-tp,s.tgfilter,1-tp,LOCATION_DECK,0,1,1,nil,TYPE_TRAP) end
8181
Duel.SendtoGrave(g,REASON_EFFECT)
82-
end
82+
end

‎official/c18809562.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,13 @@ function s.filter(c)
1414
return (c:GetLevel()==7 or c:GetLevel()==8) and c:IsAttribute(ATTRIBUTE_DARK) and c:IsAbleToHand()
1515
end
1616
function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
17-
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsType,tp,LOCATION_HAND,0,1,e:GetHandler(),TYPE_SPELL)
17+
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsSpell,tp,LOCATION_HAND,0,1,e:GetHandler())
1818
and Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_DECK,0,1,nil) end
1919
Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
2020
end
2121
function s.activate(e,tp,eg,ep,ev,re,r,rp)
2222
Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(id,0))
23-
local ag=Duel.SelectMatchingCard(tp,Card.IsType,tp,LOCATION_HAND,0,1,1,nil,TYPE_SPELL)
23+
local ag=Duel.SelectMatchingCard(tp,Card.IsSpell,tp,LOCATION_HAND,0,1,1,nil)
2424
if #ag>0 then
2525
Duel.SendtoHand(ag,1-tp,REASON_EFFECT)
2626
Duel.ConfirmCards(tp,ag)

‎official/c21623008.lua

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,11 +28,10 @@ end
2828
function s.operation(e,tp,eg,ep,ev,re,r,rp)
2929
Duel.DiscardDeck(tp,2,REASON_EFFECT)
3030
Duel.DiscardDeck(1-tp,2,REASON_EFFECT)
31-
if Duel.IsExistingMatchingCard(Card.IsType,tp,LOCATION_GRAVE,0,3,nil,TYPE_SPELL)
31+
if Duel.IsExistingMatchingCard(Card.IsSpell,tp,LOCATION_GRAVE,0,3,nil)
3232
and Duel.IsExistingMatchingCard(s.filter,tp,0,LOCATION_MZONE,1,nil)
3333
and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
3434
local g=Duel.GetMatchingGroup(s.filter,tp,0,LOCATION_MZONE,nil)
3535
Duel.SendtoDeck(g,nil,0,REASON_EFFECT)
3636
end
37-
end
38-
37+
end

‎official/c23672629.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -65,11 +65,11 @@ function s.tdcon(e,tp,eg,ep,ev,re,r,rp)
6565
return eg:IsExists(s.tdcfilter,1,nil,tp)
6666
end
6767
function s.tdtg(e,tp,eg,ep,ev,re,r,rp,chk)
68-
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsType,tp,LOCATION_DECK,0,1,nil,TYPE_SPELL) end
68+
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsSpell,tp,LOCATION_DECK,0,1,nil) end
6969
end
7070
function s.tdop(e,tp,eg,ep,ev,re,r,rp)
7171
Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(id,2))
72-
local tc=Duel.SelectMatchingCard(tp,Card.IsType,tp,LOCATION_DECK,0,1,1,nil,TYPE_SPELL):GetFirst()
72+
local tc=Duel.SelectMatchingCard(tp,Card.IsSpell,tp,LOCATION_DECK,0,1,1,nil):GetFirst()
7373
if tc then
7474
Duel.ShuffleDeck(tp)
7575
Duel.MoveSequence(tc,0)

‎official/c24140059.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ end
1111
s.listed_names={CARD_NECROVALLEY}
1212
function s.operation(e,tp,eg,ep,ev,re,r,rp)
1313
Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(id,1))
14-
local g=Duel.SelectMatchingCard(tp,Card.IsType,tp,LOCATION_DECK,0,1,1,nil,TYPE_TRAP)
14+
local g=Duel.SelectMatchingCard(tp,Card.IsTrap,tp,LOCATION_DECK,0,1,1,nil)
1515
local tc=g:GetFirst()
1616
if tc then
1717
if Duel.IsEnvironment(CARD_NECROVALLEY) and tc:IsAbleToHand() and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then

‎official/c25733157.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
3838
e1:SetValue(s.efilter)
3939
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
4040
tc:RegisterEffect(e1)
41-
if Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_SPELL)>=3 then
41+
if Duel.GetMatchingGroupCount(Card.IsSpell,tp,LOCATION_GRAVE,0,nil)>=3 then
4242
--Cannot be destroyed by battle if 3+ spells in GY
4343
local e2=Effect.CreateEffect(e:GetHandler())
4444
e2:SetDescription(3000)

‎official/c25955749.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
3434
local tc=Duel.GetFirstTarget()
3535
if tc:IsRelateToEffect(e) and Duel.Destroy(tc,REASON_EFFECT)~=0 then
3636
local dg=Duel.GetMatchingGroup(nil,tp,LOCATION_MZONE,LOCATION_MZONE,nil)
37-
if #dg>0 and Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_SPELL)>=3 and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
37+
if #dg>0 and Duel.GetMatchingGroupCount(Card.IsSpell,tp,LOCATION_GRAVE,0,nil)>=3 and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
3838
Duel.BreakEffect()
3939
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
4040
local sg=dg:Select(tp,1,1,nil)

‎official/c26495087.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -34,4 +34,4 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp)
3434
if #g~=0 then
3535
Duel.SendtoGrave(g,REASON_EFFECT)
3636
end
37-
end
37+
end

‎official/c32723153.lua

+4-4
Original file line numberDiff line numberDiff line change
@@ -16,14 +16,14 @@ function s.condition(e,tp,eg,ep,ev,re,r,rp)
1616
return Duel.GetFieldGroupCount(tp,LOCATION_HAND,0)==0
1717
end
1818
function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
19-
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsType,tp,LOCATION_GRAVE,0,1,nil,TYPE_SPELL) end
19+
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsSpell,tp,LOCATION_GRAVE,0,1,nil) end
2020
Duel.SetTargetPlayer(1-tp)
21-
local dam=Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_SPELL)*200
21+
local dam=Duel.GetMatchingGroupCount(Card.IsSpell,tp,LOCATION_GRAVE,0,nil)*200
2222
Duel.SetTargetParam(dam)
2323
Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,dam)
2424
end
2525
function s.activate(e,tp,eg,ep,ev,re,r,rp)
2626
local p=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER)
27-
local dam=Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_SPELL)*200
27+
local dam=Duel.GetMatchingGroupCount(Card.IsSpell,tp,LOCATION_GRAVE,0,nil)*200
2828
Duel.Damage(p,dam,REASON_EFFECT)
29-
end
29+
end

‎official/c33776734.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -79,5 +79,5 @@ function s.rmtarget(e,c)
7979
return c:IsFaceup() and c:GetFlagEffect(id)>0 and Duel.IsPlayerCanRemove(e:GetHandlerPlayer(),c)
8080
end
8181
function s.val(e,c)
82-
return Duel.GetMatchingGroupCount(Card.IsType,c:GetControler(),0,LOCATION_GRAVE,nil,TYPE_SPELL)*500
83-
end
82+
return Duel.GetMatchingGroupCount(Card.IsSpell,c:GetControler(),0,LOCATION_GRAVE,nil)*500
83+
end

‎official/c34694160.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function s.initial_effect(c)
2828
c:RegisterEffect(e3)
2929
end
3030
function s.reccon(e,tp,eg,ep,ev,re,r,rp)
31-
return Duel.GetTurnPlayer()~=tp and Duel.IsExistingMatchingCard(Card.IsType,tp,0,LOCATION_HAND,1,nil,TYPE_SPELL)
31+
return Duel.GetTurnPlayer()~=tp and Duel.IsExistingMatchingCard(Card.IsSpell,tp,0,LOCATION_HAND,1,nil)
3232
end
3333
function s.rectg(e,tp,eg,ep,ev,re,r,rp,chk)
3434
if chk==0 then return true end

‎official/c37649320.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ function s.efilter(e,re)
3838
return re:IsActiveType(TYPE_MONSTER) and re:GetOwner()~=e:GetOwner()
3939
end
4040
function s.thcon(e,tp,eg,ep,ev,re,r,rp)
41-
return e:GetHandler():GetOverlayGroup():IsExists(Card.IsType,1,nil,TYPE_TRAP)
41+
return e:GetHandler():GetOverlayGroup():IsExists(Card.IsTrap,1,nil)
4242
end
4343
function s.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
4444
if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end

‎official/c39761138.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function s.rmtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
2828
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
2929
local g=Duel.SelectTarget(tp,s.rmfilter,tp,0,LOCATION_MZONE+LOCATION_GRAVE,1,1,nil)
3030
Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,#g,0,0)
31-
if Duel.IsExistingMatchingCard(Card.IsType,tp,0,LOCATION_GRAVE,1,nil,TYPE_SPELL) then e:SetLabel(0)
31+
if Duel.IsExistingMatchingCard(Card.IsSpell,tp,0,LOCATION_GRAVE,1,nil) then e:SetLabel(0)
3232
else
3333
e:SetLabel(1)
3434
Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,500)
@@ -37,11 +37,11 @@ end
3737
function s.rmop(e,tp,eg,ep,ev,re,r,rp)
3838
if not Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_GRAVE,0,3,nil,0x2c) then return end
3939
local tc=Duel.GetFirstTarget()
40-
if tc and tc:IsRelateToEffect(e) then
40+
if tc:IsRelateToEffect(e) then
4141
Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)
4242
if e:GetLabel()==1 then
4343
Duel.BreakEffect()
4444
Duel.Damage(1-tp,500,REASON_EFFECT)
4545
end
4646
end
47-
end
47+
end

‎official/c40933924.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,6 @@ function s.condition(e,tp,eg,ep,ev,re,r,rp)
1515
end
1616
function s.operation(e,tp,eg,ep,ev,re,r,rp)
1717
Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_TOGRAVE)
18-
local g=Duel.SelectMatchingCard(1-tp,Card.IsType,1-tp,LOCATION_DECK,0,1,1,nil,TYPE_SPELL)
18+
local g=Duel.SelectMatchingCard(1-tp,Card.IsSpell,1-tp,LOCATION_DECK,0,1,1,nil)
1919
Duel.SendtoGrave(g,REASON_EFFECT)
20-
end
20+
end

‎official/c46271408.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ function s.filter(c,e,tp,spchk)
2424
return c:IsSetCard(0x1115) and c:IsMonster() and c:IsLevel(4) and (c:IsAbleToHand() or (spchk and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false)))
2525
end
2626
function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
27-
local spchk=Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_SPELL)>=3
27+
local spchk=Duel.GetMatchingGroupCount(Card.IsSpell,tp,LOCATION_GRAVE,0,nil)>=3
2828
if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_GRAVE) and s.filter(c,e,tp,spchk) end
2929
if chk==0 then return Duel.IsExistingTarget(s.filter,tp,LOCATION_GRAVE,0,1,nil,spchk) end
3030
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
@@ -38,7 +38,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
3838
if tc and tc:IsRelateToEffect(e) then
3939
aux.ToHandOrElse(tc,tp,
4040
function(c)
41-
return Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_SPELL)>=3
41+
return Duel.GetMatchingGroupCount(Card.IsSpell,tp,LOCATION_GRAVE,0,nil)>=3
4242
and Duel.GetLocationCount(tp,LOCATION_MZONE)>0
4343
and tc:IsCanBeSpecialSummoned(e,0,tp,false,false)
4444
end,

‎official/c51227866.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ function s.filter(c,e,tp,spchk)
2727
end
2828
function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
2929
local spchk=false
30-
if Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_SPELL)>=3 then
30+
if Duel.GetMatchingGroupCount(Card.IsSpell,tp,LOCATION_GRAVE,0,nil)>=3 then
3131
spchk=true
3232
end
3333
if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_GRAVE) and s.filter(c,e,tp,spchk) end
@@ -41,7 +41,7 @@ end
4141
function s.activate(e,tp,eg,ep,ev,re,r,rp)
4242
local tc=Duel.GetFirstTarget()
4343
if tc:IsRelateToEffect(e) then
44-
if Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_SPELL)>=3
44+
if Duel.GetMatchingGroupCount(Card.IsSpell,tp,LOCATION_GRAVE,0,nil)>=3
4545
and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and tc:IsCanBeSpecialSummoned(e,0,tp,false,false)
4646
and (not tc:IsAbleToRemove() or Duel.SelectYesNo(tp,aux.Stringid(id,0))) then
4747
Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)

‎official/c52340444.lua

+3-3
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ function s.condition(e,tp,eg,ep,ev,re,r,rp)
2020
end
2121
function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
2222
local atk=0
23-
if Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_SPELL)>=3 then
23+
if Duel.GetMatchingGroupCount(Card.IsSpell,tp,LOCATION_GRAVE,0,nil)>=3 then
2424
atk=1500
2525
end
2626
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
@@ -30,7 +30,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
3030
end
3131
function s.activate(e,tp,eg,ep,ev,re,r,rp)
3232
local atk=0
33-
if Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_SPELL)>=3 then
33+
if Duel.GetMatchingGroupCount(Card.IsSpell,tp,LOCATION_GRAVE,0,nil)>=3 then
3434
atk=1500
3535
end
3636
if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0
@@ -50,7 +50,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
5050
e2:SetCode(EFFECT_UNRELEASABLE_NONSUM)
5151
token:RegisterEffect(e2)
5252
--Gains 1500 ATK/DEF if 3+ spells are in the GY when resolving
53-
if Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_SPELL)>=3 then
53+
if Duel.GetMatchingGroupCount(Card.IsSpell,tp,LOCATION_GRAVE,0,nil)>=3 then
5454
local e3=Effect.CreateEffect(e:GetHandler())
5555
e3:SetType(EFFECT_TYPE_SINGLE)
5656
e3:SetCode(EFFECT_SET_ATTACK)

‎official/c59344077.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ end
1616
function s.activate(e,tp,eg,ep,ev,re,r,rp)
1717
if Duel.IsChainDisablable(0) then
1818
local sel=1
19-
local g=Duel.GetMatchingGroup(Card.IsType,tp,0,LOCATION_HAND,nil,TYPE_SPELL)
19+
local g=Duel.GetMatchingGroup(Card.IsSpell,tp,0,LOCATION_HAND,nil)
2020
Duel.Hint(HINT_SELECTMSG,1-tp,aux.Stringid(id,0))
2121
if #g>0 then
2222
sel=Duel.SelectOption(1-tp,1213,1214)

‎official/c60912752.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,5 +17,5 @@ function s.initial_effect(c)
1717
c:RegisterEffect(e2)
1818
end
1919
function s.bpcon(e)
20-
return not Duel.IsExistingMatchingCard(Card.IsType,e:GetHandlerPlayer(),LOCATION_GRAVE,0,1,nil,TYPE_SPELL)
21-
end
20+
return not Duel.IsExistingMatchingCard(Card.IsSpell,e:GetHandlerPlayer(),LOCATION_GRAVE,0,1,nil)
21+
end

‎official/c61307542.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
6868
end
6969
end
7070
function s.descon(e,tp,eg,ep,ev,re,r,rp)
71-
return e:GetHandler():GetOverlayGroup():IsExists(Card.IsType,1,nil,TYPE_TRAP)
71+
return e:GetHandler():GetOverlayGroup():IsExists(Card.IsTrap,1,nil)
7272
end
7373
function s.descost(e,tp,eg,ep,ev,re,r,rp,chk)
7474
if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end

‎official/c63166095.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -36,11 +36,11 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
3636
Duel.SendtoHand(g,nil,REASON_EFFECT)
3737
Duel.ConfirmCards(1-tp,g)
3838
if Duel.IsPlayerCanDraw(tp,1)
39-
and Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_SPELL)>=3
39+
and Duel.GetMatchingGroupCount(Card.IsSpell,tp,LOCATION_GRAVE,0,nil)>=3
4040
and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
4141
Duel.BreakEffect()
4242
Duel.ShuffleDeck(tp)
4343
Duel.Draw(tp,1,REASON_EFFECT)
4444
end
4545
end
46-
end
46+
end

‎official/c63288573.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ function s.matfilter(c,scard,sumtype,tp)
2929
return c:IsSetCard(0x1115,scard,sumtype,tp) and not c:IsAttribute(ATTRIBUTE_FIRE,scard,sumtype,tp)
3030
end
3131
function s.atkval(e)
32-
return Duel.GetMatchingGroupCount(Card.IsType,e:GetHandlerPlayer(),LOCATION_GRAVE,0,nil,TYPE_SPELL)*100
32+
return Duel.GetMatchingGroupCount(Card.IsSpell,e:GetHandlerPlayer(),LOCATION_GRAVE,0,nil)*100
3333
end
3434
function s.thfilter(c,tp)
3535
return c:IsSetCard(0x115) and c:IsSpell() and c:IsAbleToHand()

‎official/c65301952.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ function s.initial_effect(c)
2626
c:RegisterEffect(e2,false,REGISTER_FLAG_DETACH_XMAT)
2727
end
2828
function s.atkval(e,c)
29-
return Duel.GetMatchingGroupCount(Card.IsType,c:GetControler(),LOCATION_GRAVE,0,nil,TYPE_SPELL)*200
29+
return Duel.GetMatchingGroupCount(Card.IsSpell,c:GetControler(),LOCATION_GRAVE,0,nil)*200
3030
end
3131
function s.setcon(e,tp,eg,ep,ev,re,r,rp)
3232
return Duel.GetTurnPlayer()==tp

‎official/c90673288.lua

+2-3
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ function s.matfilter(c,scard,sumtype,tp)
4040
return c:IsSetCard(0x1115,scard,sumtype,tp) and not c:IsAttribute(ATTRIBUTE_WATER,scard,sumtype,tp)
4141
end
4242
function s.atkval(e)
43-
return Duel.GetMatchingGroupCount(Card.IsType,e:GetHandlerPlayer(),LOCATION_GRAVE,0,nil,TYPE_SPELL)*-100
43+
return Duel.GetMatchingGroupCount(Card.IsSpell,e:GetHandlerPlayer(),LOCATION_GRAVE,0,nil)*-100
4444
end
4545
function s.regop(e,tp,eg,ep,ev,re,r,rp)
4646
e:GetHandler():RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
@@ -63,5 +63,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
6363
Duel.SendtoHand(g,nil,REASON_EFFECT)
6464
Duel.ConfirmCards(1-tp,g)
6565
end
66-
end
67-
66+
end

‎official/c97616504.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ function s.condition(e,tp,eg,ep,ev,re,r,rp)
5050
end
5151
function s.drcon(e,tp,eg,ep,ev,re,r,rp)
5252
local ec=e:GetHandler():GetEquipTarget()
53-
return Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_SPELL)>=3 and eg:GetFirst()==ec and Duel.GetAttacker()==ec
53+
return Duel.GetMatchingGroupCount(Card.IsSpell,tp,LOCATION_GRAVE,0,nil)>=3 and eg:GetFirst()==ec and Duel.GetAttacker()==ec
5454
end
5555
function s.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
5656
if chk==0 then return true end

‎official/c98338152.lua

+2-3
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
2828
if chk==0 then return Duel.IsExistingTarget(s.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
2929
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
3030
Duel.SelectTarget(tp,s.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
31-
if Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_SPELL)>=3 then
31+
if Duel.GetMatchingGroupCount(Card.IsSpell,tp,LOCATION_GRAVE,0,nil)>=3 then
3232
e:SetCategory(CATEGORY_DISABLE+CATEGORY_CONTROL)
3333
end
3434
end
@@ -55,11 +55,10 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
5555
e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
5656
tc:RegisterEffect(e3)
5757
end
58-
if Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_SPELL)>=3 and
58+
if Duel.GetMatchingGroupCount(Card.IsSpell,tp,LOCATION_GRAVE,0,nil)>=3 and
5959
tc:IsControlerCanBeChanged() and tc:IsControler(1-tp) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
6060
Duel.BreakEffect()
6161
Duel.GetControl(tc,tp,PHASE_END,1)
6262
end
6363
end
6464
end
65-

‎official/c98827725.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,5 +34,5 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
3434
end
3535
end
3636
function s.actcon(e)
37-
return not Duel.IsExistingMatchingCard(Card.IsType,e:GetHandlerPlayer(),LOCATION_GRAVE,0,1,nil,TYPE_TRAP)
38-
end
37+
return not Duel.IsExistingMatchingCard(Card.IsTrap,e:GetHandlerPlayer(),LOCATION_GRAVE,0,1,nil)
38+
end

‎official/c99550630.lua

+4-7
Original file line numberDiff line numberDiff line change
@@ -27,19 +27,16 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
2727
local g=Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
2828
Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
2929
end
30-
function s.filter(c)
31-
return c:IsType(TYPE_SPELL+TYPE_TRAP)
32-
end
3330
function s.activate(e,tp,eg,ep,ev,re,r,rp)
3431
local tc=Duel.GetFirstTarget()
35-
if tc and tc:IsRelateToEffect(e) and Duel.Destroy(tc,REASON_EFFECT)>0 then
36-
local dg=Duel.GetMatchingGroup(s.filter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,e:GetHandler())
37-
if #dg>0 and Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_SPELL)>=3 and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
32+
if tc:IsRelateToEffect(e) and Duel.Destroy(tc,REASON_EFFECT)>0 then
33+
local dg=Duel.GetMatchingGroup(Card.IsSpellTrap,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,e:GetHandler())
34+
if #dg>0 and Duel.GetMatchingGroupCount(Card.IsSpell,tp,LOCATION_GRAVE,0,nil)>=3 and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
3835
Duel.BreakEffect()
3936
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
4037
local sg=dg:Select(tp,1,1,nil)
4138
Duel.HintSelection(sg)
4239
Duel.Destroy(sg,REASON_EFFECT)
4340
end
4441
end
45-
end
42+
end

‎official/c99590524.lua

+2-2
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ function s.initial_effect(c)
1414
c:RegisterEffect(e1)
1515
end
1616
function s.condition(e,tp,eg,ep,ev,re,r,rp)
17-
return not Duel.IsExistingMatchingCard(Card.IsType,tp,LOCATION_GRAVE,0,1,nil,TYPE_TRAP)
17+
return not Duel.IsExistingMatchingCard(Card.IsTrap,tp,LOCATION_GRAVE,0,1,nil)
1818
end
1919
function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
2020
if chkc then return chkc:IsLocation(LOCATION_MZONE) end
@@ -26,4 +26,4 @@ end
2626
function s.activate(e,tp,eg,ep,ev,re,r,rp)
2727
local g=Duel.GetTargetCards(e)
2828
Duel.Destroy(g,REASON_EFFECT)
29-
end
29+
end

0 commit comments

Comments
 (0)