Commit b6f81f52 authored by REIKAI's avatar REIKAI 💬

Merge branch '2022.12.18' into 'master'

2022.12.18

See merge request !3
parents d74ebeeb 5f4e8054
Pipeline #18831 passed with stages
in 20 minutes and 34 seconds
This diff is collapsed.
...@@ -63,6 +63,7 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -63,6 +63,7 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
end end
end end
function cm.desop(e,tp,eg,ep,ev,re,r,rp) function cm.desop(e,tp,eg,ep,ev,re,r,rp)
if Duel.GetTurnPlayer()==tp then return end
Duel.Destroy(e:GetHandler(),REASON_RULE) Duel.Destroy(e:GetHandler(),REASON_RULE)
end end
function cm.splimit(e,c,tp,sumtp,sumpos) function cm.splimit(e,c,tp,sumtp,sumpos)
......
...@@ -9,14 +9,14 @@ function s.initial_effect(c) ...@@ -9,14 +9,14 @@ function s.initial_effect(c)
"Damage,NegateEffect", nil, "MonsterZone", nil, nil, { "Damage,NegateEffect", nil, "MonsterZone", nil, nil, {
{ "PlayerTarget", "Damage", 1000, 1000 }, { "PlayerTarget", "Damage", 1000, 1000 },
{ "~Target", aux.NegateAnyFilter, "NegateEffect", { "~Target", aux.NegateAnyFilter, "NegateEffect",
0, "Field", B2Sayaka.LPDifferentChk } }, s.damop) 0, "OnField", B2Sayaka.LPDifferentChk } }, s.damop)
B2Sayaka.Effect2Condition(id, e2, EVENT_SUMMON_SUCCESS, s.regop, B2Sayaka.Effect2Condition(id, e2, EVENT_SUMMON_SUCCESS, s.regop,
EVENT_FLIP_SUMMON_SUCCESS, EVENT_SPSUMMON_SUCCESS) EVENT_FLIP_SUMMON_SUCCESS, EVENT_SPSUMMON_SUCCESS)
local e3 = Scl.CreateSingleTriggerOptionalEffect(c, EVENT_RELEASE, local e3 = Scl.CreateSingleTriggerOptionalEffect(c, EVENT_RELEASE,
"ShuffleIn2Deck", {1, id + 200}, "ShuffleIn2Deck", {1, id + 200},
"ShuffleIn2Deck", "Delay", B2Sayaka.ExtraLimit, nil, { "ShuffleIn2Deck", "Delay", B2Sayaka.ExtraLimit, nil, {
"~Target", Card.IsAbleToDeck, "ShuffleIn2Deck", "~Target", Card.IsAbleToDeck, "ShuffleIn2Deck",
0, "Field", B2Sayaka.LPDifferent2Chk }, s.tdop) 0, "OnField", B2Sayaka.LPDifferent2Chk }, s.tdop)
end end
function s.damop(e,tp) function s.damop(e,tp)
if not B2Sayaka.Damage(tp) then return end if not B2Sayaka.Damage(tp) then return end
...@@ -30,5 +30,5 @@ function s.regop(e,tp,eg) ...@@ -30,5 +30,5 @@ function s.regop(e,tp,eg)
end end
function s.tdop(e,tp) function s.tdop(e,tp)
local ct = B2Sayaka.LPDifferent2() local ct = B2Sayaka.LPDifferent2()
Scl.SelectAndOperateCards("ShuffleIn2Deck", tp, Card.IsAbleToDeck, tp, 0, "Field", 1, ct, nil)() Scl.SelectAndOperateCards("ShuffleIn2Deck", tp, Card.IsAbleToDeck, tp, 0, "OnField", 1, ct, nil)()
end end
\ No newline at end of file
...@@ -9,7 +9,7 @@ function s.initial_effect(c) ...@@ -9,7 +9,7 @@ function s.initial_effect(c)
"GainLP,Send2GY", nil, "MonsterZone", nil, nil, { "GainLP,Send2GY", nil, "MonsterZone", nil, nil, {
{ "PlayerTarget", "GainLP", 1000 }, { "PlayerTarget", "GainLP", 1000 },
{ "~Target", Card.IsAbleToGrave, "Send2GY", { "~Target", Card.IsAbleToGrave, "Send2GY",
0, "Field", B2Sayaka.LPDifferentAdd1000Chk} }, s.damop) 0, "OnField", B2Sayaka.LPDifferentAdd1000Chk} }, s.damop)
B2Sayaka.Effect2Condition(id, e2, EVENT_DAMAGE, s.regop) B2Sayaka.Effect2Condition(id, e2, EVENT_DAMAGE, s.regop)
local e3 = Scl.CreateSingleTriggerOptionalEffect(c, EVENT_RELEASE, local e3 = Scl.CreateSingleTriggerOptionalEffect(c, EVENT_RELEASE,
"ShuffleIn2Deck", {1, id + 200}, "ShuffleIn2Deck", {1, id + 200},
...@@ -20,11 +20,11 @@ end ...@@ -20,11 +20,11 @@ end
function s.damop(e,tp) function s.damop(e,tp)
if Duel.Recover(tp, 1000, REASON_EFFECT) <= 0 then return end if Duel.Recover(tp, 1000, REASON_EFFECT) <= 0 then return end
local ct = B2Sayaka.LPDifferent() local ct = B2Sayaka.LPDifferent()
Scl.SelectAndOperateCards("Send2GY",tp,Card.IsAbleToGrave,tp,0,"Field",1,ct,nil)() Scl.SelectAndOperateCards("Send2GY",tp,Card.IsAbleToGrave,tp,0,"OnField",1,ct,nil)()
end end
function s.regop(e,tp,eg,ep) function s.regop(e,tp,eg,ep)
Duel.RegisterFlagEffect(ep, id, RESET_EP_SCL, 0 , 1) Duel.RegisterFlagEffect(ep, id, RESET_EP_SCL, 0 , 1)
end end
function s.drop(e,tp) function s.drop(e,tp)
Scl.SelectAndOperateCards("ShuffleIn2Deck&Draw",tp,Card.IsAbleToDeck,tp,"Banish,GY",0,1,3,nil)(nil, 2, tp, 1) Scl.SelectAndOperateCards("ShuffleIn2Deck&Draw",tp,Card.IsAbleToDeck,tp,"Banished,GY",0,1,3,nil)(nil, 2, tp, 1)
end end
\ No newline at end of file
...@@ -6,7 +6,7 @@ function s.initial_effect(c) ...@@ -6,7 +6,7 @@ function s.initial_effect(c)
e1:SetCondition(B2Sayaka.ExtraLimit) e1:SetCondition(B2Sayaka.ExtraLimit)
local e2 = Scl.CreateFieldBuffEffect(c, "!BeEffectTarget", 1, s.tg, local e2 = Scl.CreateFieldBuffEffect(c, "!BeEffectTarget", 1, s.tg,
{"MonsterZone", 0}, "FieldZone") {"MonsterZone", 0}, "FieldZone")
local e3 = Scl.CreateFieldBuffEffect(c, "!BeDestroyedByEffect", 1, s.tg, local e3 = Scl.CreateFieldBuffEffect(c, "!BeDestroyedByEffects", 1, s.tg,
{"MonsterZone", 0}, "FieldZone") {"MonsterZone", 0}, "FieldZone")
local e4 = Scl.CreateIgnitionEffect(c, "ChangeLevel", 1, "ChangeLevel", nil, local e4 = Scl.CreateIgnitionEffect(c, "ChangeLevel", 1, "ChangeLevel", nil,
"FieldZone", nil, nil, { "FieldZone", nil, 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