Skip to content

Y
ygopro-222DIY-cards
Commit 59e49334 authored by Huangnan's avatar Huangnan
Browse files
Options

fix

parent 3018308e
Hide whitespace changes
Inline Side-by-side
Showing with 33 additions and 28 deletions
expansions/script/c16349205.lua
View file @ 59e49334
......@@ -21,7 +21,8 @@ function c16349205.initial_effect(c)
c:RegisterEffect(e2)
end
function c16349205.filter1(c,tp)
return c:IsType(TYPE_FUSION) and Duel.IsExistingMatchingCard(c16349205.filter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil,c)
return c:IsType(TYPE_FUSION) and c:IsSetCard(0x6dc2)
and Duel.IsExistingMatchingCard(c16349205.filter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil,c)
end
function c16349205.filter2(c,fc)
return (c:IsAttribute(fc:GetAttribute()) or c:IsRace(fc:GetRace())) and c:IsAbleToHand() and c:IsSetCard(0x6dc2)
......
expansions/script/c18700126.lua
View file @ 59e49334
--天卷慧庭-99 米伽丝洛塔·维尔斯娅
local m=18700126
local cm=_G["c"..m]
Duel.LoadScript("1.lua")
function cm.initial_effect(c)
c:EnableReviveLimit()
local e0=Effect.CreateEffect(c)
......@@ -55,7 +54,7 @@ function cm.mfilter(c)
return c:IsLinkType(TYPE_LINK) and c:IsLinkAbove(4)
end
function cm.lmfilter(c,lc,tp,og,lmat)
return c:IsFaceup() and c:IsCanBeLinkMaterial(lc) and c:IsLink(5) and c:IsLinkType(TYPE_LINK)
return c:IsFaceup() and c:IsCanBeLinkMaterial(lc) and c:IsLinkAbove(4) and c:IsLinkType(TYPE_LINK)
and Duel.GetLocationCountFromEx(tp,tp,c,lc)>0 and aux.MustMaterialCheck(c,tp,EFFECT_MUST_BE_LMATERIAL)
and (not og or og:IsContains(c)) and (not lmat or lmat==c)
end
......
expansions/script/c18700151.lua
View file @ 59e49334
--祈星魔女之凭依
local m=18700151
local cm=_G["c"..m]
xpcall(function() require("expansions/script/1") end,function() require("script/1") end)
function cm.initial_effect(c)
local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_ACTIVATE)
......@@ -76,11 +75,11 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
e0:SetCode(EFFECT_CANNOT_ACTIVATE)
e0:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e0:SetTargetRange(1,0)
e0:SetTarget(cm.aclimit)
e0:SetValue(cm.aclimit)
Duel.RegisterEffect(e0,tp)
end
function cm.aclimit(e,re,tp)
return re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:IsActiveType(TYPE_TRAP)
return re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:GetHandler():IsType(TYPE_TRAP)
end
function cm.tgcon(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():IsPreviousLocation(LOCATION_DECK)
......
expansions/script/c18700155.lua
View file @ 59e49334
......@@ -58,14 +58,14 @@ function cm.setop(e,tp,eg,ep,ev,re,r,rp)
e0:SetCode(EFFECT_CANNOT_ACTIVATE)
e0:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e0:SetTargetRange(1,0)
e0:SetTarget(cm.aclimit)
e0:SetValue(cm.aclimit)
Duel.RegisterEffect(e0,tp)
local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD)
e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e1:SetTargetRange(1,0)
e1:SetTarget(cm.splimit2)
e1:SetValue(cm.splimit2)
e1:Reset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e1,tp)
end
......
expansions/script/c18700157.lua
View file @ 59e49334
......@@ -66,14 +66,14 @@ function cm.setop(e,tp,eg,ep,ev,re,r,rp)
e0:SetCode(EFFECT_CANNOT_ACTIVATE)
e0:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e0:SetTargetRange(1,0)
e0:SetTarget(cm.aclimit)
e0:SetValue(cm.aclimit)
Duel.RegisterEffect(e0,tp)
local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD)
e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e1:SetTargetRange(1,0)
e1:SetTarget(cm.splimit2)
e1:SetValue(cm.splimit2)
e1:Reset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e1,tp)
end
......
expansions/script/c18700159.lua
View file @ 59e49334
......@@ -63,14 +63,14 @@ function cm.setop(e,tp,eg,ep,ev,re,r,rp)
e0:SetCode(EFFECT_CANNOT_ACTIVATE)
e0:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e0:SetTargetRange(1,0)
e0:SetTarget(cm.aclimit)
e0:SetValue(cm.aclimit)
Duel.RegisterEffect(e0,tp)
local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD)
e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e1:SetTargetRange(1,0)
e1:SetTarget(cm.splimit2)
e1:SetValue(cm.splimit2)
e1:Reset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e1,tp)
end
......
expansions/script/c18700161.lua
View file @ 59e49334
......@@ -140,7 +140,7 @@ function cm.thop2(e,tp,eg,ep,ev,re,r,rp)
e0:SetCode(EFFECT_CANNOT_ACTIVATE)
e0:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e0:SetTargetRange(1,0)
e0:SetTarget(cm.aclimit)
e0:SetValue(cm.aclimit)
Duel.RegisterEffect(e0,tp)
end
function cm.aclimit(e,re,tp)
......
expansions/script/c18700165.lua
View file @ 59e49334
......@@ -134,17 +134,19 @@ end
function cm.setop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
local tc=Duel.SelectMatchingCard(tp,cm.filter,tp,LOCATION_DECK,0,1,1,nil):GetFirst()
if tc then Duel.SSet(tp,tc) end
if tc then
Duel.SSet(tp,tc)
end
local e0=Effect.CreateEffect(e:GetHandler())
e0:SetType(EFFECT_TYPE_FIELD)
e0:SetCode(EFFECT_CANNOT_ACTIVATE)
e0:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e0:SetCode(EFFECT_CANNOT_ACTIVATE)
e0:SetTargetRange(1,0)
e0:SetTarget(cm.aclimit)
e0:SetValue(cm.aclimit)
Duel.RegisterEffect(e0,tp)
end
function cm.aclimit(e,re,tp)
return re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:IsActiveType(TYPE_TRAP)
return re:GetHandler():IsType(TYPE_TRAP) and re:IsHasType(EFFECT_TYPE_ACTIVATE)
end
function cm.pencon(e,tp,eg,ep,ev,re,r,rp)
......
expansions/script/c18700171.lua
View file @ 59e49334
......@@ -75,14 +75,14 @@ function cm.setop(e,tp,eg,ep,ev,re,r,rp)
e0:SetCode(EFFECT_CANNOT_ACTIVATE)
e0:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e0:SetTargetRange(1,0)
e0:SetTarget(cm.aclimit)
e0:SetValue(cm.aclimit)
Duel.RegisterEffect(e0,tp)
local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD)
e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e1:SetTargetRange(1,0)
e1:SetTarget(cm.splimit2)
e1:SetValue(cm.splimit2)
e1:Reset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e1,tp)
end
......
expansions/script/c18700464.lua
View file @ 59e49334
......@@ -64,7 +64,7 @@ function cm.setop(e,tp,eg,ep,ev,re,r,rp)
e0:SetCode(EFFECT_CANNOT_ACTIVATE)
e0:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e0:SetTargetRange(1,0)
e0:SetTarget(cm.aclimit)
e0:SetValue(cm.aclimit)
Duel.RegisterEffect(e0,tp)
end
function cm.aclimit(e,re,tp)
......
expansions/script/c18700476.lua
View file @ 59e49334
......@@ -18,7 +18,7 @@ function cm.condition(e,tp)
return Duel.GetTurnPlayer()==tp or (Duel.GetTurnPlayer()~=tp and Duel.IsExistingMatchingCard(cm.filter2,tp,LOCATION_MZONE,0,1,nil))
end
function cm.filter(c)
return c:IsType(TYPE_SPELL) and c:IsSetCard(0x824) and c:CheckActivateEffect(false,true,false)~=nil and not (c:IsType(TYPE_CONTINUOUS) and c:IsCode(m))
return c:IsType(TYPE_SPELL) and c:IsSetCard(0x824) and c:CheckActivateEffect(true,true,false)~=nil and not (c:IsType(TYPE_CONTINUOUS+TYPE_FIELD) or c:IsCode(m))
end
function cm.tktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then
......@@ -31,7 +31,7 @@ function cm.tktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
local g=Duel.SelectMatchingCard(tp,cm.filter,tp,LOCATION_HAND+LOCATION_SZONE+LOCATION_GRAVE,0,1,1,nil)
Duel.ConfirmCards(1-tp,g)
local te,ceg,cep,cev,cre,cr,crp=g:GetFirst():CheckActivateEffect(false,true,true)
local te,ceg,cep,cev,cre,cr,crp=g:GetFirst():CheckActivateEffect(true,true,true)
Duel.ClearTargetCard()
g:GetFirst():CreateEffectRelation(e)
local tg=te:GetTarget()
......@@ -41,6 +41,7 @@ function cm.tktg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
e:SetLabelObject(te)
Duel.ClearOperationInfo(0)
end
function cm.tkop(e,tp,eg,ep,ev,re,r,rp)
local te=e:GetLabelObject()
local tc=te:GetHandler()
......@@ -53,7 +54,7 @@ function cm.tkop(e,tp,eg,ep,ev,re,r,rp)
e1:SetCode(EFFECT_CANNOT_ACTIVATE)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e1:SetTargetRange(1,0)
e1:SetTarget(cm.aclimit)
e1:SetValue(cm.aclimit)
e1:Reset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e1,tp)
end
......
expansions/script/c47340512.lua
View file @ 59e49334
......@@ -29,7 +29,8 @@ function s.negcost(e,tp,eg,ep,ev,re,r,rp,chk)
c:RemoveOverlayCard(tp,1,1,REASON_COST)
end
function s.negtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE,tp,LOCATION_REASON_TOFIELD)>0 end
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE,tp,LOCATION_REASON_TOFIELD)>0
and Duel.IsExistingMatchingCard(s.tffilter,tp,LOCATION_MZONE,0,1,e:GetHandler()) end
Duel.SetOperationInfo(0,CATEGORY_NEGATE,eg,1,0,0)
end
function s.tffilter(c)
......@@ -37,12 +38,13 @@ function s.tffilter(c)
end
function s.negop(e,tp,eg,ep,ev,re,r,rp)
if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return end
local c=e:GetHandler()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
local g=Duel.SelectMatchingCard(tp,s.tffilter,tp,LOCATION_MZONE,0,1,1,nil)
local g=Duel.SelectMatchingCard(tp,s.tffilter,tp,LOCATION_MZONE,0,1,1,c)
if #g>0 then
local tc=g:GetFirst()
if Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true) then
local e1=Effect.CreateEffect(e:GetHandler())
local e1=Effect.CreateEffect(c)
e1:SetCode(EFFECT_CHANGE_TYPE)
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
......
expansions/script/c62699969.lua
View file @ 59e49334
......@@ -38,7 +38,7 @@ function c62699969.counterfilter(c)
return c:IsSetCard(0x6df) or not c:IsSummonLocation(LOCATION_EXTRA)
end
function c62699969.mfilter(c)
return c:IsLinkCode(62699999,62699988,62699979,62699969,62699840,62699815,62699800)
return c:IsLinkCode(62699999,62699990,62699988,62699979,62699969,62699890,62699840,62699815,62699800)
end
function c62699969.spcost(e,c,tp)
return Duel.GetCustomActivityCount(62699969,tp,ACTIVITY_SPSUMMON)==0
......@@ -57,7 +57,8 @@ function c62699969.splimit(e,c,tp,sumtp,sumpos)
return not c:IsSetCard(0x6df) and c:IsLocation(LOCATION_EXTRA)
end
function c62699969.tdfilter(c,e)
return c:IsSetCard(0x6df) and c:IsType(TYPE_MONSTER) and c:IsAbleToDeck() and c:IsCanBeEffectTarget(e)
return c:IsSetCard(0x6df) and c:IsType(TYPE_MONSTER) and c:IsFaceupEx()
and c:IsAbleToDeck() and c:IsCanBeEffectTarget(e)
end
function c62699969.tdtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c62699969.tdfilter(chkc) 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