Commit dbc3473e authored by POLYMER's avatar POLYMER

fix

parent 2470acdc
...@@ -325,17 +325,6 @@ ...@@ -325,17 +325,6 @@
18155301 0 18155301 0
18678558 0 18678558 0
19198211 0 19198211 0
20000450 0
20000451 0
20000452 0
20000453 0
20000454 0
20000455 0
20000456 0
20000457 0
20000458 0
20000459 0
20000460 0
20220679 0 20220679 0
21099999 0 21099999 0
21113800 0 21113800 0
......
No preview for this file type
No preview for this file type
...@@ -164,17 +164,24 @@ function cm.operation4(e,tp,eg,ep,ev,re,r,rp) ...@@ -164,17 +164,24 @@ function cm.operation4(e,tp,eg,ep,ev,re,r,rp)
if #sg>0 and Duel.ChangePosition(sg,POS_FACEUP_DEFENSE,POS_FACEDOWN_DEFENSE,POS_FACEUP_ATTACK,POS_FACEUP_ATTACK)>0 then if #sg>0 and Duel.ChangePosition(sg,POS_FACEUP_DEFENSE,POS_FACEDOWN_DEFENSE,POS_FACEUP_ATTACK,POS_FACEUP_ATTACK)>0 then
local rg=Duel.GetMatchingGroup(cm.sfilter,tp,LOCATION_MZONE,LOCATION_MZONE,nil) local rg=Duel.GetMatchingGroup(cm.sfilter,tp,LOCATION_MZONE,LOCATION_MZONE,nil)
for tc in aux.Next(rg) do for tc in aux.Next(rg) do
local e1=Effect.CreateEffect(tc) local e1=nil
e1:SetDescription(1104) local _CRegisterEffect=Card.RegisterEffect
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F) function Card.RegisterEffect(c,e,...)
e1:SetCode(EVENT_CUSTOM+m) if e:GetType()&0x801==0x801 and (e:GetCode()==EVENT_SUMMON_SUCCESS or e:GetCode()==EVENT_FLIP) and e:GetOperation() then pcall(e:GetOperation(),e,c:GetControler()) end
e1:SetRange(LOCATION_MZONE) if e:IsHasType(EFFECT_TYPE_TRIGGER_F) and e:GetCode()==EVENT_PHASE+PHASE_END then e1=e:Clone() end
e1:SetCountLimit(1) return true
e1:SetCondition(Auxiliary.SpiritReturnConditionForced) end
e1:SetTarget(Auxiliary.SpiritReturnTargetForced) Duel.CreateToken(tp,tc:GetOriginalCode())
e1:SetOperation(Auxiliary.SpiritReturnOperation) Card.RegisterEffect=_CRegisterEffect
e1:SetReset(RESET_EVENT+RESETS_STANDARD) if e1 then
tc:RegisterEffect(e1,true) Debug.Message(e1:GetCode())
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
e1:SetCode(EVENT_CUSTOM+m)
e1:SetRange(LOCATION_MZONE)
e1:SetCountLimit(1)
e1:SetReset(RESET_EVENT+RESETS_STANDARD)
tc:RegisterEffect(e1,true)
end
end end
Duel.RaiseEvent(e:GetHandler(),EVENT_CUSTOM+m,e,0,0,0,0) Duel.RaiseEvent(e:GetHandler(),EVENT_CUSTOM+m,e,0,0,0,0)
end end
......
...@@ -89,8 +89,8 @@ function cm.clear(e,tp,eg,ep,ev,re,r,rp) ...@@ -89,8 +89,8 @@ function cm.clear(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function cm.con(e,tp,eg,ep,ev,re,r,rp) function cm.con(e,tp,eg,ep,ev,re,r,rp)
local loc=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION) local loc,pos=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION,CHAININFO_TRIGGERING_POSITION)
return loc&LOCATION_HAND>0 and re:GetHandler():IsLocation(LOCATION_HAND) and re:GetHandler():IsPublic() return loc&LOCATION_HAND>0 and ((re:GetHandler():IsLocation(LOCATION_HAND) and re:GetHandler():IsPublic()) or pos&POS_FACEUP>0)
end end
function cm.tg(e,tp,eg,ep,ev,re,r,rp,chk) function cm.tg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then if chk==0 then
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
function c9911065.initial_effect(c) function c9911065.initial_effect(c)
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetProperty(EFFECT_FLAG_LIMIT_ZONE) e1:SetProperty(EFFECT_FLAG_LIMIT_ZONE)
...@@ -50,6 +49,8 @@ function c9911065.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -50,6 +49,8 @@ function c9911065.target(e,tp,eg,ep,ev,re,r,rp,chk)
if s==0 then if s==0 then
e:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_COUNTER) e:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_COUNTER)
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
else
e:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
end end
end end
function c9911065.addfilter(c) function c9911065.addfilter(c)
......
...@@ -2,7 +2,6 @@ ...@@ -2,7 +2,6 @@
function c9911070.initial_effect(c) function c9911070.initial_effect(c)
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetProperty(EFFECT_FLAG_LIMIT_ZONE) e1:SetProperty(EFFECT_FLAG_LIMIT_ZONE)
...@@ -86,6 +85,8 @@ function c9911070.target(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -86,6 +85,8 @@ function c9911070.target(e,tp,eg,ep,ev,re,r,rp,chk)
if s==0 then if s==0 then
e:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON) e:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON)
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
else
e:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
end end
end end
function c9911070.addfilter(c) function c9911070.addfilter(c)
......
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