Skip to content

Y
ygopro-222DIY-cards
Commit b84e2358 authored by TanakaKotoha's avatar TanakaKotoha
Browse files
Options

lua and cdb fix

parent 0468b388
Hide whitespace changes
Inline Side-by-side
Showing with 24 additions and 161 deletions
expansions/222DIY.cdb
View file @ b84e2358
No preview for this file type
expansions/script/c21520162.lua
View file @ b84e2358
......@@ -91,7 +91,7 @@ function c21520162.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.ConfirmDecktop(p,1)
local tc=g:GetFirst()
local ops=2
if tc:IsSetCard(0x490) and (tc:IsCanBeSpecialSummoned(e,0,p,false,false) or tc:IsAbleToGrave()) then
if tc:IsSetCard(0x490) and tc:IsType(TYPE_MONSTER) and (tc:IsCanBeSpecialSummoned(e,0,p,false,false) or tc:IsAbleToGrave()) then
if Duel.GetLocationCount(p,LOCATION_MZONE)>0 then ops=Duel.SelectOption(p,aux.Stringid(21520162,4),aux.Stringid(21520162,5))
else
ops=1
......
expansions/script/c21520163.lua
View file @ b84e2358
......@@ -73,7 +73,7 @@ function c21520163.ccost(e,tp)
end
end
function c21520163.rfilter(c)
return (c:IsAttribute(ATTRIBUTE_DARK) or c:IsAttribute(ATTRIBUTE_LIGHT)) and c:IsAbleToGraveAsCost()
return (c:IsAttribute(ATTRIBUTE_DARK) or c:IsAttribute(ATTRIBUTE_LIGHT)) and c:IsAbleToGraveAsCost() and c:IsType(TYPE_MONSTER)
end
function c21520163.drcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c21520163.rfilter,tp,LOCATION_DECK,0,1,nil) end
......
expansions/script/c21520164.lua
View file @ b84e2358
......@@ -72,7 +72,7 @@ function c21520164.ccost(e,tp)
end
end
function c21520164.filter(c,e,tp)
return c:IsFaceup() and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsLevelBelow(4) and c:IsSetCard(0x490)
return c:IsFaceup() and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsLevelBelow(4) and c:IsSetCard(0x490) and c:IsType(TYPE_MONSTER)
end
function c21520164.tg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
......
expansions/script/c21520165.lua
View file @ b84e2358
......@@ -116,9 +116,9 @@ end
function c21520165.cfilter(c,stname)
if stname==nil then
return (c:IsAttribute(ATTRIBUTE_LIGHT) or c:IsAttribute(ATTRIBUTE_DARK)) and c:IsAbleToGrave()
return (c:IsAttribute(ATTRIBUTE_LIGHT) or c:IsAttribute(ATTRIBUTE_DARK)) and c:IsAbleToGrave() and c:IsType(TYPE_MONSTER)
else
return c:IsSetCard(stname) and c:IsAbleToGrave()
return c:IsSetCard(stname) and c:IsAbleToGrave() and c:IsType(TYPE_MONSTER)
end
end
function c21520165.cost1(e,tp,eg,ep,ev,re,r,rp,chk)
......
expansions/script/c21520166.lua
View file @ b84e2358
......@@ -105,7 +105,7 @@ function c21520166.thcon(e,tp,eg,ep,ev,re,r,rp)
return ep~=tp
end
function c21520166.thfilter(c)
return c:IsSetCard(0x490) and c:IsLevelBelow(4) and c:IsAbleToHand()
return c:IsSetCard(0x490) and c:IsLevelBelow(4) and c:IsAbleToHand() and c:IsType(TYPE_MONSTER)
end
function c21520166.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c21520166.thfilter,tp,LOCATION_DECK,0,1,nil) end
......
expansions/script/c21520168.lua
View file @ b84e2358
......@@ -104,7 +104,7 @@ function c21520168.splimit(e,c,sump,sumtype,sumpos,targetp,se)
return not c:IsSetCard(0x490)
end
function c21520168.tohandfilter(c)
return c:IsSetCard(0x490) and c:IsAbleToHand() and c:IsType(TYPE_MONSTER)
return c:IsSetCard(0x490) and c:IsAbleToHand()
end
function c21520168.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return (chkc:GetControler()==tp and chkc:GetLocation()==LOCATION_GRAVE and c21520168.tohandfilter(chkc)) end
......
expansions/script/c21520169.lua
View file @ b84e2358
......@@ -72,7 +72,7 @@ function c21520169.ccost(e,tp)
end
end
function c21520169.dfilter(c)
return (c:IsAttribute(ATTRIBUTE_LIGHT) or c:IsAttribute(ATTRIBUTE_DARK)) and not c:IsPublic()
return (c:IsAttribute(ATTRIBUTE_LIGHT) or c:IsAttribute(ATTRIBUTE_DARK)) and not c:IsPublic() and c:IsType(TYPE_MONSTER)
end
function c21520169.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c21520169.dfilter,tp,LOCATION_HAND,0,1,nil) end
......
expansions/script/c21520170.lua
View file @ b84e2358
......@@ -72,7 +72,7 @@ function c21520170.ccost(e,tp)
end
end
function c21520170.spfilter(c,e,tp)
return c:IsLevelBelow(4) and c:IsSetCard(0x490) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
return c:IsLevelBelow(4) and c:IsSetCard(0x490) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsType(TYPE_MONSTER)
end
function c21520170.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c21520170.spfilter,tp,LOCATION_REMOVED,0,1,nil,e,tp) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
......
expansions/script/c21520176.lua
View file @ b84e2358
......@@ -26,7 +26,7 @@ function c21520176.initial_effect(c)
c:RegisterEffect(e2)
end
function c21520176.spfilter(c,e,tp)
return c:IsSetCard(0x490) and c:IsLevelBelow(4) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
return c:IsSetCard(0x490) and c:IsLevelBelow(4) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsType(TYPE_MONSTER)
end
function c21520176.spcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetCurrentPhase()==PHASE_MAIN1 and not Duel.CheckPhaseActivity()
......@@ -86,7 +86,7 @@ function c21520176.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.DisableShuffleCheck()
Duel.Remove(g,POS_FACEUP,REASON_COST)
local tf=0
if g:GetFirst():IsSetCard(0x490) then tf=1 end
if g:GetFirst():IsSetCard(0x490) and g:GetFirst():IsType(TYPE_MONSTER) then tf=1 end
e:SetLabel(tf)
end
function c21520176.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
......
expansions/script/c21520189.lua
View file @ b84e2358
......@@ -41,7 +41,7 @@ function c21520189.initial_effect(c)
c:RegisterEffect(e3)
end
function c21520189.pfilter(c)
return c:IsAttribute(ATTRIBUTE_LIGHT+ATTRIBUTE_DARK) and not c:IsPublic()
return c:IsAttribute(ATTRIBUTE_LIGHT+ATTRIBUTE_DARK) and not c:IsPublic() and c:IsType(TYPE_MONSTER)
end
function c21520189.spfilter(c,e,tp)
return c:IsSetCard(0x490) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsType(TYPE_MONSTER)
......@@ -137,7 +137,7 @@ function c21520189.sdrop(e,tp,eg,ep,ev,re,r,rp)
e1:SetCode(EFFECT_CANNOT_ACTIVATE)
e1:SetTargetRange(1,0)
e1:SetValue(c21520189.aclimit)
e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN)
e1:SetReset(RESET_EVENT+0x1fe0000)
tc:RegisterEffect(e1)
--destroy
local e2=Effect.CreateEffect(c)
......
expansions/script/c26801004.lua deleted 100644 → 0
View file @ 0468b388
--TRILOGY
c26801004.dfc_front_side=26801000
c26801004.dfc_back4_side=26801004
function c26801004.initial_effect(c)
--Activate
local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN)
c:RegisterEffect(e1)
--back
local e0=Effect.CreateEffect(c)
e0:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e0:SetCode(EVENT_ADJUST)
e0:SetRange(LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED+LOCATION_HAND+LOCATION_EXTRA)
e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_SET_AVAILABLE)
e0:SetCountLimit(1)
e0:SetCondition(c26801004.backon)
e0:SetOperation(c26801004.backop)
c:RegisterEffect(e0)
--cannot disable summon
local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_FIELD)
e2:SetCode(EFFECT_CANNOT_DISABLE_SPSUMMON)
e2:SetRange(LOCATION_FZONE)
e2:SetProperty(EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_SET_AVAILABLE)
e2:SetTarget(aux.TargetBoolFunction(Card.IsSummonType,SUMMON_TYPE_LINK))
c:RegisterEffect(e2)
--link
local e3=Effect.CreateEffect(c)
e3:SetDescription(aux.Stringid(26801004,0))
e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
e3:SetType(EFFECT_TYPE_QUICK_O)
e3:SetCode(EVENT_FREE_CHAIN)
e3:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
e3:SetRange(LOCATION_FZONE)
e3:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_MAIN_END)
e3:SetCountLimit(1)
e3:SetCondition(c26801004.lkcon)
e3:SetTarget(c26801004.lktg)
e3:SetOperation(c26801004.lkop)
c:RegisterEffect(e3)
--to extra
local e4=Effect.CreateEffect(c)
e4:SetDescription(aux.Stringid(26801004,1))
e4:SetCategory(CATEGORY_TOEXTRA)
e4:SetType(EFFECT_TYPE_IGNITION)
e4:SetProperty(EFFECT_FLAG_CARD_TARGET)
e4:SetRange(LOCATION_FZONE)
e4:SetCountLimit(1)
e4:SetTarget(c26801004.tdtg)
e4:SetOperation(c26801004.tdop)
c:RegisterEffect(e4)
end
function c26801004.backon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
return c.dfc_front_side and c:GetOriginalCode()==c.dfc_back4_side
end
function c26801004.backop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
local tcode=c.dfc_front_side
c:SetEntityCode(tcode)
c:ReplaceEffect(tcode,0,0)
end
function c26801004.lkcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2
end
function c26801004.matfilter(c)
return c:IsFaceup() and c:IsType(TYPE_MONSTER)
end
function c26801004.lkfilter(c)
return c:IsType(TYPE_LINK) and c:IsSpecialSummonable(SUMMON_TYPE_LINK)
end
function c26801004.lktg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then
local el={}
local mg=Duel.GetMatchingGroup(c26801004.matfilter,tp,LOCATION_MZONE,0,nil)
local g=Duel.GetMatchingGroup(Card.IsFaceup,tp,LOCATION_MZONE,0,mg)
for tc in aux.Next(g) do
local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_CANNOT_BE_LINK_MATERIAL)
tc:RegisterEffect(e1)
table.insert(el,e1)
end
local res=Duel.IsExistingMatchingCard(c26801004.lkfilter,tp,LOCATION_EXTRA,0,1,nil)
for _,e in ipairs(el) do
e:Reset()
end
return res
end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
end
function c26801004.lkop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
if not c:IsRelateToEffect(e) then return end
local el={}
local mg=Duel.GetMatchingGroup(c26801004.matfilter,tp,LOCATION_MZONE,0,nil)
local g=Duel.GetMatchingGroup(Card.IsFaceup,tp,LOCATION_MZONE,0,mg)
for tc in aux.Next(g) do
local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_CANNOT_BE_LINK_MATERIAL)
tc:RegisterEffect(e1)
table.insert(el,e1)
end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local xg=Duel.SelectMatchingCard(tp,c26801004.lkfilter,tp,LOCATION_EXTRA,0,1,1,nil)
local tc=xg:GetFirst()
if tc then
Duel.SpecialSummonRule(tp,tc,SUMMON_TYPE_LINK)
end
for _,e in ipairs(el) do
e:Reset()
end
end
function c26801004.tdfilter(c)
return c:IsType(TYPE_LINK) and c:IsAbleToExtra()
and (c:IsLocation(LOCATION_GRAVE) or c:IsFaceup())
end
function c26801004.tdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) and chkc:IsControler(tp) and c26801004.tdfilter(chkc) end
if chk==0 then return Duel.IsExistingTarget(c26801004.tdfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
local g=Duel.SelectTarget(tp,c26801004.tdfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil)
Duel.SetOperationInfo(0,CATEGORY_TODECK,g,1,0,0)
end
function c26801004.tdop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) then
Duel.SendtoDeck(tc,nil,2,REASON_EFFECT)
end
end
expansions/script/c33330009.lua
View file @ b84e2358
......@@ -35,13 +35,11 @@ function cm.ngcon(e,tp,eg,ep,ev,re,r,rp,chk)
and not re:GetHandler():IsType(TYPE_TOKEN)
end
function cm.ngcost(e,tp,eg,ep,ev,re,r,rp,chk)
--local og=e:GetHandler():GetOverlayGroup()
-- if chk==0 then return og:GetCount()>0 and og:IsExists(Card.IsSetCard,1,nil,0x556) end
-- Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVEXYZ)
-- local g=og:FilterSelect(tp,Card.IsSetCard,1,1,nil,0x556)
-- Duel.SendtoGrave(g,REASON_COST)
if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
local og=e:GetHandler():GetOverlayGroup()
if chk==0 then return og:GetCount()>0 and og:IsExists(Card.IsSetCard,1,nil,0x556) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVEXYZ)
local g=og:FilterSelect(tp,Card.IsSetCard,1,1,nil,0x556)
Duel.SendtoGrave(g,REASON_COST)
end
function cm.ngtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsType(TYPE_XYZ) end
......@@ -59,7 +57,7 @@ function cm.ngop(e,tp,eg,ep,ev,re,r,rp)
end
end
--Destroy Replace
function cm.reptg(e,tp,eg,ep,ev,re,r,rp,chk)
function cm.reptg(e,c)
if chk==0 then return not c:IsReason(REASON_REPLACE) and c:IsReason(REASON_EFFECT)
and e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_EFFECT) end
if Duel.SelectEffectYesNo(tp,e:GetHandler(),96) then
......
expansions/script/c33330038.lua
View file @ b84e2358
......@@ -76,11 +76,11 @@ end
function cm.indtg(e,c)
return c:IsFaceup() and c:IsSetCard(0x556)
end
function cm.indval1(e,re)
return aux.indoval(e,re) and re:IsActiveType(TYPE_SPELL)
function cm.indval1(e,re,rp)
return aux.indoval(e,re,rp) and re:IsActiveType(TYPE_SPELL)
end
function cm.indval2(e,re)
return aux.indoval(e,re) and re:IsActiveType(TYPE_MONSTER)
function cm.indval2(e,re,rp)
return aux.indoval(e,re,rp) and re:IsActiveType(TYPE_MONSTER)
end
function cm.efilter(e,te)
return te:GetOwnerPlayer()~=e:GetHandlerPlayer() and te:IsActiveType(TYPE_TRAP)
......
expansions/script/c33701020.lua
View file @ b84e2358
......@@ -5,7 +5,7 @@ local s = c33701020
local id = 33701020
function s.initial_effect(c)
c:EnableReviveLimit()
aux.AddFusionProcMixN(c, true, true, s.ffilter, 3)
aux.AddFusionProcFunRep(c, aux.FilterBoolFunction(Card.IsFusionSetCard, 0x144e), 3, false)
--special summon self
local e1 = Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(id, 0))
......@@ -30,9 +30,6 @@ function s.initial_effect(c)
e2:SetOperation(s.tgop)
c:RegisterEffect(e2)
end
function s.ffilter(c, fc, sumtype, tp, sub, mg, sg)
return c:IsFusionSetCard(0x144e)
end
function s.spcon(e, tp, eg, ep, ev, re, r, rp)
local ct = Duel.GetActivityCount(tp, ACTIVITY_BATTLE_PHASE)
return Duel.GetTurnPlayer() == tp and ct == 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