Commit 66202708 authored by Huangnan's avatar Huangnan

fix

parent ebf04182
...@@ -32,7 +32,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -32,7 +32,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
if e:IsHasType(EFFECT_TYPE_ACTIVATE) then if e:IsHasType(EFFECT_TYPE_ACTIVATE) then
if Duel.GetTurnPlayer()==1-tp then if Duel.GetTurnPlayer()==1-tp then
e:SetCategory(CATEGORY_SPECIAL_SUMMON) e:SetCategory(CATEGORY_SPECIAL_SUMMON)
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
e:SetLabel(1) e:SetLabel(1)
else else
e:SetLabel(0) e:SetLabel(0)
......
...@@ -100,11 +100,10 @@ function c21185608.location(c) ...@@ -100,11 +100,10 @@ function c21185608.location(c)
return not c:IsLocation(LOCATION_EXTRA) return not c:IsLocation(LOCATION_EXTRA)
end end
function c21185608.LCheckGoal(sg,tp,lc,gf,lmat) function c21185608.LCheckGoal(sg,tp,lc,gf,lmat)
local ug=sg:Filter(Card.IsLocation,nil,LOCATION_EXTRA)
return sg:CheckWithSumEqual(Auxiliary.GetLinkCount,lc:GetLink(),#sg,#sg) return sg:CheckWithSumEqual(Auxiliary.GetLinkCount,lc:GetLink(),#sg,#sg)
and Duel.GetLocationCountFromEx(tp,tp,sg,lc)>0 and (not gf or gf(sg,lc,tp)) and Duel.GetLocationCountFromEx(tp,tp,sg,lc)>0 and (not gf or gf(sg,lc,tp))
and not sg:IsExists(Auxiliary.LUncompatibilityFilter,1,nil,sg,lc,tp) and not sg:IsExists(Auxiliary.LUncompatibilityFilter,1,nil,sg,lc,tp)
and (not lmat or sg:IsContains(lmat)) and (ug==nil or ug:GetCount()<=1) and (not lmat or sg:IsContains(lmat)) and not sg:IsExists(Card.IsLocation,2,nil,LOCATION_EXTRA)
end end
function c21185608.LinkTarget(f,minct,maxct,gf) function c21185608.LinkTarget(f,minct,maxct,gf)
return function(e,tp,eg,ep,ev,re,r,rp,chk,c,og,lmat,min,max) return function(e,tp,eg,ep,ev,re,r,rp,chk,c,og,lmat,min,max)
......
...@@ -41,7 +41,7 @@ c:EnableReviveLimit() ...@@ -41,7 +41,7 @@ c:EnableReviveLimit()
end end
function cm.ffilter(c,fc,sub,mg,sg) function cm.ffilter(c,fc,sub,mg,sg)
return c:IsFusionSetCard(0xc86) and (not sg or not sg:IsExists(Card.IsFusionAttribute,1,c,c:GetFusionAttribute())) return c:IsType(TYPE_MONSTER) and c:IsFusionSetCard(0xc86) and (not sg or not sg:IsExists(Card.IsFusionAttribute,1,c,c:GetFusionAttribute()))
end end
function cm.splimit(e,se,sp,st) function cm.splimit(e,se,sp,st)
return not e:GetHandler():IsLocation(LOCATION_EXTRA) or aux.fuslimit(e,se,sp,st) return not e:GetHandler():IsLocation(LOCATION_EXTRA) or aux.fuslimit(e,se,sp,st)
...@@ -62,7 +62,7 @@ end ...@@ -62,7 +62,7 @@ end
function cm.operation(e,tp,eg,ep,ev,re,r,rp) function cm.operation(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
if tc:IsRelateToEffect(e) and tc:IsFaceup() then
local att=tc:GetAttribute() local att=tc:GetAttribute()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
local g=Duel.SelectMatchingCard(tp,cm.tgfilter,tp,LOCATION_DECK+LOCATION_EXTRA,0,1,1,nil,att) local g=Duel.SelectMatchingCard(tp,cm.tgfilter,tp,LOCATION_DECK+LOCATION_EXTRA,0,1,1,nil,att)
...@@ -79,7 +79,6 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -79,7 +79,6 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
e5:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END) e5:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
tc:RegisterEffect(e5) tc:RegisterEffect(e5)
end end
end
end end
function cm.condition1(e,tp,eg,ep,ev,re,r,rp) function cm.condition1(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