Commit 1c35390d authored by POLYMER's avatar POLYMER

fix

parent 33febe45
...@@ -56,11 +56,11 @@ function cm.initial_effect(c) ...@@ -56,11 +56,11 @@ function cm.initial_effect(c)
e5:SetRange(0xff) e5:SetRange(0xff)
e5:SetValue(0x151) e5:SetValue(0x151)
c:RegisterEffect(e5) c:RegisterEffect(e5)
if not cm.pendulum_link then --[[if not cm.pendulum_link then
cm.pendulum_link=true cm.pendulum_link=true
_GetLinkCount=Auxiliary.GetLinkCount _GetLinkCount=Auxiliary.GetLinkCount
Auxiliary.GetLinkCount=function(tc) if tc:GetOriginalCode()==m and tc:IsLocation(LOCATION_PZONE) then return 0x20001 else return _GetLinkCount(tc) end end Auxiliary.GetLinkCount=function(tc) if tc:GetOriginalCode()==m and tc:IsLocation(LOCATION_PZONE) then return 0x20001 else return _GetLinkCount(tc) end end
end end--]]
end end
if not Duel.GetMustMaterial then if not Duel.GetMustMaterial then
function Duel.GetMustMaterial(tp,code) function Duel.GetMustMaterial(tp,code)
......
...@@ -36,10 +36,10 @@ function cm.initial_effect(c) ...@@ -36,10 +36,10 @@ function cm.initial_effect(c)
end end
function c11561075.thfilter1(c) function c11561075.thfilter1(c)
return c:IsType(TYPE_MONSTER) and Duel.IsExistingMatchingCard(c11561075.thfilter2,tp,LOCATION_DECK,0,1,nil,c) return c:IsType(TYPE_MONSTER) and c:IsLevelAbove(0) and Duel.IsExistingTarget(c11561075.thfilter2,tp,0,LOCATION_GRAVE,1,nil,c)
end end
function c11561075.thfilter2(c,tc) function c11561075.thfilter2(c,tc)
return c:IsAttribute(tc:GetAttribute()) and not c:IsRace(tc:GetRace()) and c:IsAbleToHand() return c:IsLevel(tc:GetLevel()) and not c:IsAttribute(tc:GetAttribute()) and c:IsAbleToHand()
end end
function c11561075.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c11561075.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(1-tp) and c11561075.thfilter1(chkc) end if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(1-tp) and c11561075.thfilter1(chkc) end
...@@ -65,7 +65,10 @@ function c11561075.mfilter(c,xyzc) ...@@ -65,7 +65,10 @@ function c11561075.mfilter(c,xyzc)
return c:IsXyzLevel(xyzc,6) return c:IsXyzLevel(xyzc,6)
end end
function c11561075.xyzcheck(g) function c11561075.xyzcheck(g)
return g:GetClassCount(Card.GetAttribute)==1 local attr=g:GetFirst():GetAttribute()
local tc=g:GetNext()
while tc do attr=attr&tc:GetAttribute() tc=g:GetNext() end
return attr>0
end end
function c11561075.dtccost(e,tp,eg,ep,ev,re,r,rp,chk) function c11561075.dtccost(e,tp,eg,ep,ev,re,r,rp,chk)
local ct1=Duel.GetFieldGroupCount(tp,0,LOCATION_DECK) local ct1=Duel.GetFieldGroupCount(tp,0,LOCATION_DECK)
......
...@@ -57,12 +57,11 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -57,12 +57,11 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
local sg=g:Select(tp,1,1,nil) local sg=g:Select(tp,1,1,nil)
if Duel.Destroy(sg,REASON_EFFECT)~=0 then Duel.Destroy(sg,REASON_EFFECT)
Duel.Draw(tp,2,REASON_EFFECT)
Duel.BreakEffect()
Duel.Destroy(e:GetHandler(),REASON_EFFECT)
end
end end
Duel.Draw(tp,2,REASON_EFFECT)
Duel.BreakEffect()
Duel.Destroy(e:GetHandler(),REASON_EFFECT)
end end
function s.spcon(e,tp,eg,ep,ev,re,r,rp) function s.spcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
......
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