Skip to content

Y
ygopro-scripts
Commit e390c844 authored by mallu11's avatar mallu11 Committed by GitHub
Browse files
Options

fix マドルチェ・プロムナード and メルフィー・マミィ (#1462)

parent 4d94b4cd
Hide whitespace changes
Inline Side-by-side
Showing with 8 additions and 8 deletions
c68159562.lua
View file @ e390c844
...@@ -79,8 +79,8 @@ end ...@@ -79,8 +79,8 @@ end
function c68159562.tgfilter(c) function c68159562.tgfilter(c)
return c:IsFaceup() and c:IsType(TYPE_XYZ) and c:IsSetCard(0x71) return c:IsFaceup() and c:IsType(TYPE_XYZ) and c:IsSetCard(0x71)
end end
function c68159562.matfilter(c) function c68159562.matfilter(c,e)
return c:IsSetCard(0x71) and c:IsType(TYPE_MONSTER) and c:IsCanOverlay() return c:IsSetCard(0x71) and c:IsType(TYPE_MONSTER) and c:IsCanOverlay() and (not e or not c:IsImmuneToEffect(e))
end end
function c68159562.mattg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c68159562.mattg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and c68159562.tgfilter(chkc) end if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and c68159562.tgfilter(chkc) end
...@@ -91,9 +91,9 @@ function c68159562.mattg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -91,9 +91,9 @@ function c68159562.mattg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
end end
function c68159562.matop(e,tp,eg,ep,ev,re,r,rp) function c68159562.matop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) and not tc:IsImmuneToEffect(e) then if tc:IsRelateToEffect(e) then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c68159562.matfilter),tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c68159562.matfilter),tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil,e)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.Overlay(tc,g) Duel.Overlay(tc,g)
end end
......
c76833149.lua
View file @ e390c844
...@@ -40,8 +40,8 @@ function c76833149.initial_effect(c) ...@@ -40,8 +40,8 @@ function c76833149.initial_effect(c)
e4:SetOperation(c76833149.damop) e4:SetOperation(c76833149.damop)
c:RegisterEffect(e4) c:RegisterEffect(e4)
end end
function c76833149.ovfilter(c) function c76833149.ovfilter(c,e)
return (c:IsFaceup() or c:IsLocation(LOCATION_HAND)) and c:IsRace(RACE_BEAST) and c:IsCanOverlay() return (c:IsFaceup() or c:IsLocation(LOCATION_HAND)) and c:IsRace(RACE_BEAST) and c:IsCanOverlay() and (not e or not c:IsImmuneToEffect(e))
end end
function c76833149.ovtg(e,tp,eg,ep,ev,re,r,rp,chk) function c76833149.ovtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsType(TYPE_XYZ) if chk==0 then return e:GetHandler():IsType(TYPE_XYZ)
...@@ -51,9 +51,9 @@ function c76833149.ovop(e,tp,eg,ep,ev,re,r,rp) ...@@ -51,9 +51,9 @@ function c76833149.ovop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:IsRelateToEffect(e) then if c:IsRelateToEffect(e) then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
local g=Duel.SelectMatchingCard(tp,c76833149.ovfilter,tp,LOCATION_MZONE+LOCATION_HAND,0,1,1,c) local g=Duel.SelectMatchingCard(tp,c76833149.ovfilter,tp,LOCATION_MZONE+LOCATION_HAND,0,1,1,c,e)
local tc=g:GetFirst() local tc=g:GetFirst()
if tc and not c:IsImmuneToEffect(e) then if tc then
local og=tc:GetOverlayGroup() local og=tc:GetOverlayGroup()
if og:GetCount()>0 then if og:GetCount()>0 then
Duel.SendtoGrave(og,REASON_RULE) Duel.SendtoGrave(og,REASON_RULE)
......
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