Commit df736134 authored by POLYMER's avatar POLYMER

fix

parent 45b95803
...@@ -29,7 +29,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -29,7 +29,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
e2:SetCountLimit(1,id) e2:SetCountLimit(1,id)
e2:SetCondition(s.negcon) e2:SetCondition(s.negcon)
e2:SetOperation(s.negop) e2:SetOperation(s.negop)
c:RegisterEffect(e2) --c:RegisterEffect(e2)
Duel.RegisterEffect(e2,tp) Duel.RegisterEffect(e2,tp)
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_FIELD) e3:SetType(EFFECT_TYPE_FIELD)
......
...@@ -7,6 +7,7 @@ function s.initial_effect(c) ...@@ -7,6 +7,7 @@ function s.initial_effect(c)
--search --search
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(id,1)) e1:SetDescription(aux.Stringid(id,1))
e1:SetCategory(CATEGORY_SEARCH+CATEGORY_TOHAND)
e1:SetType(EFFECT_TYPE_QUICK_O) e1:SetType(EFFECT_TYPE_QUICK_O)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetHintTiming(TIMING_END_PHASE,TIMING_END_PHASE+TIMING_STANDBY_PHASE) e1:SetHintTiming(TIMING_END_PHASE,TIMING_END_PHASE+TIMING_STANDBY_PHASE)
...@@ -89,20 +90,18 @@ function s.getsearchgroup(c,e,tp,eg,ep,ev,re,r,rp) ...@@ -89,20 +90,18 @@ function s.getsearchgroup(c,e,tp,eg,ep,ev,re,r,rp)
return true return true
end end
Card.IsAbleToHand=function(card) Card.IsAbleToHand=function(card)
search_effect=true s.discard_effect=true
return cisabletohand(card) return cisabletohand(card)
end end
Card.IsAbleToHandAsCost=function(card) Card.IsAbleToHandAsCost=function(card)
search_effect=true s.discard_effect=true
return cisabletohandascost(card) return cisabletohandascost(card)
end end
Card.RegisterEffect=function(card,effect,flag) Card.RegisterEffect=function(card,effect,flag)
if effect and effect:GetType()~=EFFECT_TYPE_FIELD then if effect and effect:GetType()~=EFFECT_TYPE_FIELD then
search_effect=false s.discard_effect=false
local cost=effect:GetCost() local cost=effect:GetCost()
local tg=effect:GetTarget()
if cost and cost(e,tp,eg,ep,ev,re,r,rp,0) then end if cost and cost(e,tp,eg,ep,ev,re,r,rp,0) then end
if tg and tg(e,tp,eg,ep,ev,re,r,rp,0) then end
end end
return return
end end
......
...@@ -27,7 +27,7 @@ function s.initial_effect(c) ...@@ -27,7 +27,7 @@ function s.initial_effect(c)
--set --set
local e3=Effect.CreateEffect(c) local e3=Effect.CreateEffect(c)
e3:SetDescription(aux.Stringid(id,2)) e3:SetDescription(aux.Stringid(id,2))
e3:SetCategory(CATEGORY_TOGRAVE+CATEGORY_SPECIAL_SUMMON) e3:SetCategory(CATEGORY_TOGRAVE+CATEGORY_SPECIAL_SUMMON+CATEGORY_SEARCH)
e3:SetType(EFFECT_TYPE_IGNITION) e3:SetType(EFFECT_TYPE_IGNITION)
e3:SetProperty(EFFECT_FLAG_CARD_TARGET) e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
e3:SetRange(LOCATION_MZONE) e3:SetRange(LOCATION_MZONE)
...@@ -83,7 +83,6 @@ function s.settg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -83,7 +83,6 @@ function s.settg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
local g=Duel.SelectTarget(tp,s.tgfilter,tp,LOCATION_ONFIELD,0,1,1,nil) local g=Duel.SelectTarget(tp,s.tgfilter,tp,LOCATION_ONFIELD,0,1,1,nil)
Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,g,1,0,0) Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,g,1,0,0)
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
end end
function s.gcfilter(c) function s.gcfilter(c)
return c:IsType(TYPE_SPELL+TYPE_TRAP) and not c:IsType(TYPE_FIELD) return c:IsType(TYPE_SPELL+TYPE_TRAP) and not c:IsType(TYPE_FIELD)
......
...@@ -3,8 +3,8 @@ local s,id,o=GetID() ...@@ -3,8 +3,8 @@ local s,id,o=GetID()
function s.initial_effect(c) function s.initial_effect(c)
--set --set
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
e1:SetDescription(aux.Stringid(id,0)) e1:SetDescription(aux.Stringid(id,0))
e1:SetCategory(CATEGORY_SEARCH)
e1:SetType(EFFECT_TYPE_QUICK_O) e1:SetType(EFFECT_TYPE_QUICK_O)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetRange(LOCATION_HAND+LOCATION_MZONE) e1:SetRange(LOCATION_HAND+LOCATION_MZONE)
...@@ -57,7 +57,6 @@ function s.setfilter2(c,e,tp,type) ...@@ -57,7 +57,6 @@ function s.setfilter2(c,e,tp,type)
end end
function s.settg(e,tp,eg,ep,ev,re,r,rp,chk) function s.settg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(s.setfilter,tp,LOCATION_DECK,0,1,nil,e,tp) end if chk==0 then return Duel.IsExistingMatchingCard(s.setfilter,tp,LOCATION_DECK,0,1,nil,e,tp) end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
end end
function s.gcheck(g,mft,sft) function s.gcheck(g,mft,sft)
return g:FilterCount(Card.IsType,nil,TYPE_MONSTER)<=mft return g:FilterCount(Card.IsType,nil,TYPE_MONSTER)<=mft
......
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