Commit 8d6a9878 authored by POLYMER's avatar POLYMER

fix

parent 6454d798
...@@ -1330,7 +1330,6 @@ ...@@ -1330,7 +1330,6 @@
96071073 0 96071073 0
96071074 0 96071074 0
96071075 0 96071075 0
96100000 0
98452220 0 98452220 0
98730001 0 98730001 0
98730004 0 98730004 0
...@@ -5675,7 +5674,6 @@ ...@@ -5675,7 +5674,6 @@
74586611 0 74586611 0
74590055 0 74590055 0
74594972 0 74594972 0
96100000 0
40009417 0 40009417 0
40009693 0 40009693 0
98920672 0 98920672 0
......
No preview for this file type
--anger of dragon palace --anger of dragon palace
local m=11451422 local cm,m=GetID()
local cm=_G["c"..m]
function cm.initial_effect(c) function cm.initial_effect(c)
aux.AddCodeList(c,22702055) aux.AddCodeList(c,22702055)
--Activate --Activate
...@@ -35,7 +34,7 @@ function cm.filter(c) ...@@ -35,7 +34,7 @@ function cm.filter(c)
return (c:IsSetCard(0x6978) or c:IsRace(RACE_SEASERPENT)) and not c:IsPublic() return (c:IsSetCard(0x6978) or c:IsRace(RACE_SEASERPENT)) and not c:IsPublic()
end end
function cm.filter2(c) function cm.filter2(c)
return c:IsSetCard(0x6978) and c:IsAbleToDeck() and not c:IsCode(m) return c:IsSetCard(0x6978) and c:IsAbleToDeckAsCost() and not c:IsCode(m)
end end
function cm.filter3(c,tp) function cm.filter3(c,tp)
return c:IsCode(22702055) and c:IsType(TYPE_FIELD) and c:GetActivateEffect() and c:GetActivateEffect():IsActivatable(tp,true,true) return c:IsCode(22702055) and c:IsType(TYPE_FIELD) and c:GetActivateEffect() and c:GetActivateEffect():IsActivatable(tp,true,true)
...@@ -92,6 +91,7 @@ function cm.cost2(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -92,6 +91,7 @@ function cm.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
local g2=g:SelectSubGroup(tp,aux.dncheck,false,3,3) local g2=g:SelectSubGroup(tp,aux.dncheck,false,3,3)
g2:AddCard(e:GetHandler()) g2:AddCard(e:GetHandler())
Duel.SendtoDeck(g2,nil,2,REASON_COST) Duel.SendtoDeck(g2,nil,2,REASON_COST)
Duel.ConfirmCards(1-tp,e:GetHandler())
end end
function cm.target2(e,tp,eg,ep,ev,re,r,rp,chk) function cm.target2(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(cm.filter3,tp,LOCATION_DECK,0,1,nil,tp) end if chk==0 then return Duel.IsExistingMatchingCard(cm.filter3,tp,LOCATION_DECK,0,1,nil,tp) end
......
...@@ -101,14 +101,14 @@ end ...@@ -101,14 +101,14 @@ end
function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local c=e:GetHandler()
if chk==0 then if chk==0 then
if #cm[0]==0 then return false end if #cm[0]==0 or not c:IsCanBeSpecialSummoned(e,0,tp,false,false) then return false end
for tc in aux.Next(cm[0]) do for tc in aux.Next(cm[0]) do
--local cn=_G["c"..code] --local cn=_G["c"..code]
local con=tc.condition3 local con=tc.condition3
local op=tc.operation3 local op=tc.operation3
local ft=0 local ft=0
if tc:GetOriginalCode()==11451412 then ft=1 end if tc:GetOriginalCode()==11451412 then ft=1 end
if con and op and con(e,tp,eg,ep,ev,re,r,rp) then return Duel.GetLocationCount(tp,LOCATION_MZONE)>ft and c:IsCanBeSpecialSummoned(e,0,tp,false,false) end if con and op and con(e,tp,eg,ep,ev,re,r,rp) and Duel.GetLocationCount(tp,LOCATION_MZONE)>ft then return true end
end end
return false return false
end end
......
...@@ -86,7 +86,7 @@ function cm.adop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -86,7 +86,7 @@ function cm.adop2(e,tp,eg,ep,ev,re,r,rp)
local tc=g:GetFirst() local tc=g:GetFirst()
if not tc then return end if not tc then return end
local rg=Group.FromCards(c,tc) local rg=Group.FromCards(c,tc)
if Duel.SendtoHand(rg,nil,REASON_EFFECT)~=0 then if Duel.SendtoHand(rg,nil,REASON_EFFECT)>0 and Duel.GetOperatedGroup():IsExists(Card.IsLocation,1,nil,LOCATION_HAND) then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local sg=Duel.SelectMatchingCard(tp,cm.spfilter,tp,LOCATION_HAND,0,1,1,nil,e,tp) local sg=Duel.SelectMatchingCard(tp,cm.spfilter,tp,LOCATION_HAND,0,1,1,nil,e,tp)
if sg:GetCount()>0 then if sg:GetCount()>0 then
......
...@@ -3,7 +3,6 @@ local s,id,o=GetID() ...@@ -3,7 +3,6 @@ local s,id,o=GetID()
function s.initial_effect(c) function s.initial_effect(c)
--Activate --Activate
local e0=Effect.CreateEffect(c) local e0=Effect.CreateEffect(c)
e0:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
e0:SetType(EFFECT_TYPE_ACTIVATE) e0:SetType(EFFECT_TYPE_ACTIVATE)
e0:SetCode(EVENT_FREE_CHAIN) e0:SetCode(EVENT_FREE_CHAIN)
c:RegisterEffect(e0) c:RegisterEffect(e0)
......
...@@ -3,7 +3,7 @@ local cm=_G["c"..m] ...@@ -3,7 +3,7 @@ local cm=_G["c"..m]
cm.name="神意之枯骸-米蕾" cm.name="神意之枯骸-米蕾"
function cm.initial_effect(c) function cm.initial_effect(c)
c:EnableReviveLimit() c:EnableReviveLimit()
aux.AddFusionProcFunRep(c,function(c,fc,sub,mg,sg)return not sg or not sg:IsExists(Card.IsLevel,1,c,c:GetLevel())end,3,false) aux.AddFusionProcFunRep(c,function(c,fc,sub,mg,sg)return c:GetLevel()>0 and (not sg or not sg:IsExists(Card.IsLevel,1,c,c:GetLevel()))end,3,false)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
......
...@@ -83,6 +83,7 @@ function c25800031.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -83,6 +83,7 @@ function c25800031.spop(e,tp,eg,ep,ev,re,r,rp)
e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE) e2:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
e2:SetRange(LOCATION_MZONE) e2:SetRange(LOCATION_MZONE)
e2:SetValue(x*500) e2:SetValue(x*500)
e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE)
c:RegisterEffect(e2) c:RegisterEffect(e2)
local bg=Duel.GetMatchingGroup(Card.IsFaceup,tp,0,LOCATION_MZONE,nil) local bg=Duel.GetMatchingGroup(Card.IsFaceup,tp,0,LOCATION_MZONE,nil)
local b1=bg:GetCount()>0 local b1=bg:GetCount()>0
......
...@@ -41,9 +41,9 @@ function c67200909.initial_effect(c) ...@@ -41,9 +41,9 @@ function c67200909.initial_effect(c)
end end
function c67200909.filter(c,tp) function c67200909.filter(c,tp)
local r=LOCATION_REASON_TOFIELD local r=LOCATION_REASON_TOFIELD
if not c:IsControler(c:GetOwner()) then r=LOCATION_REASON_CONTROL end --if not c:IsControler(c:GetOwner()) then r=LOCATION_REASON_CONTROL end
return c:IsType(TYPE_PENDULUM) and c:IsFaceupEx() return c:IsType(TYPE_PENDULUM) and c:IsFaceupEx()
and Duel.GetLocationCount(c:GetOwner(),LOCATION_PZONE,tp,r)>0 and (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1))
end end
function c67200909.mvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c67200909.mvtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_GRAVE+LOCATION_MZONE) and c67200909.filter(chkc,tp) end if chkc then return chkc:IsLocation(LOCATION_GRAVE+LOCATION_MZONE) and c67200909.filter(chkc,tp) 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