Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix & update Duel.Overlay for ギガンティック“チャンピオン”サルガス #1988

Closed
Show file tree
Hide file tree
Changes from 3 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion c10443957.lua
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ function c10443957.operation(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and not tc:IsImmuneToEffect(e) then
local og=tc:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(c,Group.FromCards(tc))
end
Expand Down
2 changes: 1 addition & 1 deletion c11132674.lua
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function c11132674.srop(e,tp,eg,ep,ev,re,r,rp)
end
end
function c11132674.descon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(Card.IsLocation,1,nil,LOCATION_ONFIELD+LOCATION_OVERLAY)
return r&REASON_LOST_OVERLAY==0
end
function c11132674.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsOnField() end
Expand Down
4 changes: 4 additions & 0 deletions c11646785.lua
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ function c11646785.mtop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
local g=Duel.SelectMatchingCard(tp,c11646785.mtfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,1,1,nil,e)
if g:GetCount()>0 then
local og=g:GetFirst():GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(c,g)
end
end
2 changes: 1 addition & 1 deletion c12744567.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function c12744567.operation(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and not tc:IsImmuneToEffect(e) then
local og=tc:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(c,Group.FromCards(tc))
end
Expand Down
2 changes: 1 addition & 1 deletion c14602126.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ function c14602126.activate(e,tp,eg,ep,ev,re,r,rp)
if tc:IsRelateToEffect(e) and tc:IsControler(tp) and not tc:IsImmuneToEffect(e) and lc:IsRelateToEffect(e) and lc:IsControler(1-tp) and not lc:IsImmuneToEffect(e) then
local og=lc:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(tc,Group.FromCards(lc))
end
Expand Down
2 changes: 1 addition & 1 deletion c1825445.lua
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function c1825445.mtop(e,tp,eg,ep,ev,re,r,rp)
if g:GetCount()>0 then
local og=g:GetFirst():GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(tc,g)
end
Expand Down
2 changes: 1 addition & 1 deletion c20424878.lua
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,7 @@ function c20424878.ovop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and not c:IsImmuneToEffect(e) then
local og=c:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(tc,Group.FromCards(c))
end
Expand Down
2 changes: 1 addition & 1 deletion c2665273.lua
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function c2665273.drop(e,tp,eg,ep,ev,re,r,rp)
for tc in aux.Next(sg) do
local og=tc:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
end
Duel.Overlay(c,sg)
Expand Down
2 changes: 1 addition & 1 deletion c29599813.lua
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ function s.xop(e,tp,eg,ep,ev,re,r,rp)
tc:CancelToGrave()
local og=tc:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(c,Group.FromCards(tc))
end
Expand Down
2 changes: 1 addition & 1 deletion c29601381.lua
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ function c29601381.ovop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and not c:IsImmuneToEffect(e) then
local og=c:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(tc,Group.FromCards(c))
end
Expand Down
2 changes: 1 addition & 1 deletion c30761649.lua
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function s.xyzop(e,tp,eg,ep,ev,re,r,rp)
if tc1:IsType(TYPE_XYZ) and not tc1:IsImmuneToEffect(e) and tc2 and not tc2:IsImmuneToEffect(e) then
local og=tc2:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(tc1,tc2)
end
Expand Down
4 changes: 4 additions & 0 deletions c31755044.lua
Original file line number Diff line number Diff line change
Expand Up @@ -36,6 +36,10 @@ function c31755044.matop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
local tc=Duel.GetFirstTarget()
if c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and not tc:IsImmuneToEffect(e) then
local og=c:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(tc,Group.FromCards(c))
end
end
Expand Down
2 changes: 1 addition & 1 deletion c32559361.lua
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ function c32559361.operation(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) and c:IsFaceup() and tc:IsRelateToBattle() and not tc:IsImmuneToEffect(e) then
local og=tc:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(c,Group.FromCards(tc))
end
Expand Down
2 changes: 1 addition & 1 deletion c34876719.lua
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function c34876719.ovop(e,tp,eg,ep,ev,re,r,rp)
if not tc:IsImmuneToEffect(e) then
local og=tc:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(c,tg)
end
Expand Down
2 changes: 1 addition & 1 deletion c46593546.lua
Original file line number Diff line number Diff line change
Expand Up @@ -107,7 +107,7 @@ function c46593546.ovlop(e,tp,eg,ep,ev,re,r,rp)
and rc:IsRelateToEffect(re) and rc:IsControler(1-tp) and not rc:IsImmuneToEffect(e) then
local og=rc:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(c,rc)
end
Expand Down
2 changes: 1 addition & 1 deletion c48739166.lua
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,7 @@ function c48739166.operation(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and not tc:IsImmuneToEffect(e) then
local og=tc:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(c,Group.FromCards(tc))
end
Expand Down
2 changes: 1 addition & 1 deletion c55470553.lua
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function c55470553.spop(e,tp,eg,ep,ev,re,r,rp)
and tc:IsRelateToEffect(e) and not tc:IsImmuneToEffect(e) then
local og=tc:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(c,Group.FromCards(tc))
end
Expand Down
2 changes: 1 addition & 1 deletion c56818977.lua
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function c56818977.ovop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and not c:IsImmuneToEffect(e) then
local og=c:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(tc,Group.FromCards(c))
end
Expand Down
4 changes: 4 additions & 0 deletions c57031794.lua
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,10 @@ function c57031794.mtop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
local g=Duel.SelectMatchingCard(tp,c57031794.mtfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,1,1,nil,e)
if g:GetCount()>0 then
local og=g:GetFirst():GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(c,g)
end
end
4 changes: 4 additions & 0 deletions c57450198.lua
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ function c57450198.mtop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
local g=Duel.SelectMatchingCard(tp,c57450198.mtfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,1,1,nil,e)
if g:GetCount()>0 then
local og=g:GetFirst():GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(c,g)
end
end
12 changes: 9 additions & 3 deletions c67331360.lua
Original file line number Diff line number Diff line change
Expand Up @@ -120,9 +120,15 @@ function c67331360.matop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
local g2=Duel.SelectMatchingCard(tp,c67331360.cfilter,tp,LOCATION_MZONE,0,1,1,nil)
local tc=g2:GetFirst()
if tc and not tc:IsImmuneToEffect(e) and Duel.Overlay(tc,g1)~=0 then
Duel.BreakEffect()
Duel.SkipPhase(1-tp,PHASE_BATTLE,RESET_PHASE+PHASE_BATTLE_STEP,1)
if tc and not tc:IsImmuneToEffect(e) then
local og=g1:GetFirst():GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
if Duel.Overlay(tc,g1)~=0 then
Duel.BreakEffect()
Duel.SkipPhase(1-tp,PHASE_BATTLE,RESET_PHASE+PHASE_BATTLE_STEP,1)
end
end
end
end
2 changes: 1 addition & 1 deletion c67436768.lua
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function c67436768.ovop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and not c:IsImmuneToEffect(e) then
local og=c:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(tc,Group.FromCards(c))
end
Expand Down
2 changes: 1 addition & 1 deletion c69073023.lua
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ function c69073023.spop(e,tp,eg,ep,ev,re,r,rp)
if tc:IsRelateToEffect(e) and not tc:IsImmuneToEffect(e) then
local og=tc:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
tc:CancelToGrave()
Duel.Overlay(hc,tc)
Expand Down
2 changes: 1 addition & 1 deletion c720147.lua
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ function c720147.activate(e,tp,eg,ep,ev,re,r,rp)
for oc in aux.Next(g) do
local og=oc:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
end
Duel.Overlay(tc,g)
Expand Down
2 changes: 1 addition & 1 deletion c74615388.lua
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
tc1:CancelToGrave()
local og=tc1:GetOverlayGroup()
if #og>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
tc1=xg:GetNext()
end
Expand Down
2 changes: 1 addition & 1 deletion c76833149.lua
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@ function c76833149.ovop(e,tp,eg,ep,ev,re,r,rp)
if tc then
local og=tc:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(c,tc)
end
Expand Down
2 changes: 1 addition & 1 deletion c83108603.lua
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ function c83108603.matop(e,tp,eg,ep,ev,re,r,rp)
if g:GetCount()>0 then
local mg=g:GetFirst():GetOverlayGroup()
if mg:GetCount()>0 then
Duel.SendtoGrave(mg,REASON_RULE)
Duel.SendtoGrave(mg,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(tc,g)
end
Expand Down
2 changes: 1 addition & 1 deletion c83203672.lua
Original file line number Diff line number Diff line change
Expand Up @@ -41,7 +41,7 @@ function c83203672.ovop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) and tc:IsRelateToEffect(e) and not c:IsImmuneToEffect(e) then
local og=c:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(tc,Group.FromCards(c))
end
Expand Down
4 changes: 4 additions & 0 deletions c83319610.lua
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,10 @@ function c83319610.mtop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
local g=Duel.SelectMatchingCard(tp,c83319610.filter2,tp,LOCATION_HAND+LOCATION_MZONE,0,1,1,tc,e)
if g:GetCount()>0 then
local og=g:GetFirst():GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(tc,g)
end
end
Expand Down
4 changes: 4 additions & 0 deletions c85252081.lua
Original file line number Diff line number Diff line change
Expand Up @@ -81,6 +81,10 @@ function c85252081.mtop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
local g=Duel.SelectMatchingCard(tp,c85252081.mtfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,1,1,nil,e)
if g:GetCount()>0 then
local og=g:GetFirst():GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(c,g)
end
end
2 changes: 1 addition & 1 deletion c98918572.lua
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ function c98918572.xyzop(e,tp,eg,ep,ev,re,r,rp)
if not tc:IsImmuneToEffect(e) then
local og=xc:GetOverlayGroup()
if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE)
Duel.SendtoGrave(og,REASON_RULE+REASON_LOST_OVERLAY)
end
Duel.Overlay(tc,Group.FromCards(xc))
end
Expand Down
16 changes: 8 additions & 8 deletions utility.lua
Original file line number Diff line number Diff line change
Expand Up @@ -757,7 +757,7 @@ function Auxiliary.XyzOperation(f,lv,minc,maxc)
sg:Merge(sg1)
tc=og:GetNext()
end
Duel.SendtoGrave(sg,REASON_RULE)
Duel.SendtoGrave(sg,REASON_RULE+REASON_LOST_OVERLAY)
c:SetMaterial(og)
Duel.Overlay(c,og)
else
Expand All @@ -769,7 +769,7 @@ function Auxiliary.XyzOperation(f,lv,minc,maxc)
sg:Merge(sg1)
tc=mg:GetNext()
end
Duel.SendtoGrave(sg,REASON_RULE)
Duel.SendtoGrave(sg,REASON_RULE+REASON_LOST_OVERLAY)
c:SetMaterial(mg)
Duel.Overlay(c,mg)
mg:DeleteGroup()
Expand Down Expand Up @@ -847,7 +847,7 @@ function Auxiliary.XyzOperationAlter(f,lv,minc,maxc,alterf,alterdesc,alterop)
sg:Merge(sg1)
tc=og:GetNext()
end
Duel.SendtoGrave(sg,REASON_RULE)
Duel.SendtoGrave(sg,REASON_RULE+REASON_LOST_OVERLAY)
c:SetMaterial(og)
Duel.Overlay(c,og)
else
Expand All @@ -865,7 +865,7 @@ function Auxiliary.XyzOperationAlter(f,lv,minc,maxc,alterf,alterdesc,alterop)
sg:Merge(sg1)
tc=mg:GetNext()
end
Duel.SendtoGrave(sg,REASON_RULE)
Duel.SendtoGrave(sg,REASON_RULE+REASON_LOST_OVERLAY)
end
c:SetMaterial(mg)
Duel.Overlay(c,mg)
Expand Down Expand Up @@ -967,7 +967,7 @@ function Auxiliary.XyzLevelFreeOperation(f,gf,minct,maxct)
sg:Merge(sg1)
tc=og:GetNext()
end
Duel.SendtoGrave(sg,REASON_RULE)
Duel.SendtoGrave(sg,REASON_RULE+REASON_LOST_OVERLAY)
c:SetMaterial(og)
Duel.Overlay(c,og)
else
Expand All @@ -985,7 +985,7 @@ function Auxiliary.XyzLevelFreeOperation(f,gf,minct,maxct)
sg:Merge(sg1)
tc=mg:GetNext()
end
Duel.SendtoGrave(sg,REASON_RULE)
Duel.SendtoGrave(sg,REASON_RULE+REASON_LOST_OVERLAY)
end
c:SetMaterial(mg)
Duel.Overlay(c,mg)
Expand Down Expand Up @@ -1080,7 +1080,7 @@ function Auxiliary.XyzLevelFreeOperationAlter(f,gf,minct,maxct,alterf,alterdesc,
sg:Merge(sg1)
tc=og:GetNext()
end
Duel.SendtoGrave(sg,REASON_RULE)
Duel.SendtoGrave(sg,REASON_RULE+REASON_LOST_OVERLAY)
c:SetMaterial(og)
Duel.Overlay(c,og)
else
Expand All @@ -1098,7 +1098,7 @@ function Auxiliary.XyzLevelFreeOperationAlter(f,gf,minct,maxct,alterf,alterdesc,
sg:Merge(sg1)
tc=mg:GetNext()
end
Duel.SendtoGrave(sg,REASON_RULE)
Duel.SendtoGrave(sg,REASON_RULE+REASON_LOST_OVERLAY)
end
c:SetMaterial(mg)
Duel.Overlay(c,mg)
Expand Down