Commit 60689e31 authored by POLYMER's avatar POLYMER

fix

parent 4d3dc734
...@@ -357,7 +357,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -357,7 +357,7 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,1,tp,LOCATION_GRAVE+LOCATION_REMOVED) Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,1,tp,LOCATION_GRAVE+LOCATION_REMOVED)
end end
function cm.spop(e,tp,eg,ep,ev,re,r,rp) function cm.spop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(cm.thfilter2),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(cm.thfilter2),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil)
if #g>0 then if #g>0 then
Duel.SendtoDeck(g,nil,2,REASON_EFFECT) Duel.SendtoDeck(g,nil,2,REASON_EFFECT)
......
...@@ -87,6 +87,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -87,6 +87,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
if res and Duel.SelectYesNo(tp,aux.Stringid(id,4)) then if res and Duel.SelectYesNo(tp,aux.Stringid(id,4)) then
Duel.BreakEffect()
s.fusion(e,tp,eg,ep,ev,re,r,rp) s.fusion(e,tp,eg,ep,ev,re,r,rp)
end end
end end
......
...@@ -31,11 +31,14 @@ function s.initial_effect(c) ...@@ -31,11 +31,14 @@ function s.initial_effect(c)
e2:SetOperation(s.spop) e2:SetOperation(s.spop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function s.rgfilter(c)
return c:IsFaceup() and c:IsType(TYPE_MONSTER)
end
function s.rgtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.rgtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(tp) and chkc:IsLocation(0x20) end if chkc then return chkc:IsControler(tp) and chkc:IsLocation(0x20) end
if chk==0 then return Duel.IsExistingTarget(Card.IsType,tp,0x20,0x20,1,nil,TYPE_MONSTER) end if chk==0 then return Duel.IsExistingTarget(s.rgfilter,tp,0x20,0x20,1,nil) end
Duel.Hint(3,tp,504) Duel.Hint(3,tp,504)
local g=Duel.SelectTarget(tp,Card.IsType,tp,0x20,0x20,1,1,nil,TYPE_MONSTER) local g=Duel.SelectTarget(tp,s.rgfilter,tp,0x20,0x20,1,1,nil,TYPE_MONSTER)
end end
function s.rgop(e,tp,eg,ep,ev,re,r,rp) function s.rgop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
...@@ -79,6 +82,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -79,6 +82,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
if res and Duel.SelectYesNo(tp,aux.Stringid(id,2)) then if res and Duel.SelectYesNo(tp,aux.Stringid(id,2)) then
Duel.BreakEffect()
s.fusion(e,tp,eg,ep,ev,re,r,rp) s.fusion(e,tp,eg,ep,ev,re,r,rp)
end end
end end
......
...@@ -5,7 +5,7 @@ function c21692416.initial_effect(c) ...@@ -5,7 +5,7 @@ function c21692416.initial_effect(c)
e1:SetType(EFFECT_TYPE_FIELD) e1:SetType(EFFECT_TYPE_FIELD)
e1:SetCode(EFFECT_SPSUMMON_PROC) e1:SetCode(EFFECT_SPSUMMON_PROC)
e1:SetProperty(EFFECT_FLAG_UNCOPYABLE) e1:SetProperty(EFFECT_FLAG_UNCOPYABLE)
e1:SetRange(LOCATION_HAND) e1:SetRange(LOCATION_GRAVE)
e1:SetCountLimit(1,21692416+EFFECT_COUNT_CODE_OATH) e1:SetCountLimit(1,21692416+EFFECT_COUNT_CODE_OATH)
e1:SetCondition(c21692416.hspcon) e1:SetCondition(c21692416.hspcon)
e1:SetOperation(c21692416.hspop) e1:SetOperation(c21692416.hspop)
...@@ -45,7 +45,7 @@ function c21692416.hspcon(e,c) ...@@ -45,7 +45,7 @@ function c21692416.hspcon(e,c)
end end
function c21692416.hspop(e,tp,eg,ep,ev,re,r,rp,c) function c21692416.hspop(e,tp,eg,ep,ev,re,r,rp,c)
local ft=Duel.GetLocationCount(tp,LOCATION_MZONE) local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
local g=Duel.SelectMatchingCard(tp,c21692416.spfilter,tp,LOCATION_MZONE,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,c21692416.spfilter,tp,LOCATION_MZONE,0,1,1,nil)
Duel.SendtoHand(g,nil,REASON_COST) Duel.SendtoHand(g,nil,REASON_COST)
end end
......
...@@ -41,18 +41,18 @@ end ...@@ -41,18 +41,18 @@ end
c21692418.SetCard_ZW_ShLight=true c21692418.SetCard_ZW_ShLight=true
function c21692418.hspcost(e,tp,eg,ep,ev,re,r,rp,chk) function c21692418.hspcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,e:GetHandler()) end if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,e:GetHandler()) end
Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD) Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD,e:GetHandler())
end end
function c21692418.sthfil(c,tp) function c21692418.sthfil(c,tp)
return Duel.GetMZoneCount(tp,c)>0 and c:IsFaceup() and c:IsSetCard(0x555) and c:IsAbleToHand() return Duel.GetMZoneCount(tp,c)>0 and c:IsFaceup() and c:IsSetCard(0x555) and c:IsAbleToHand()
end end
function c21692418.hsptg(e,tp,eg,ep,ev,re,r,rp,chk) function c21692418.hsptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.IsExistingMatchingCard(c21692418.sthfil,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,tp) end if chk==0 then return e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.IsExistingMatchingCard(c21692418.sthfil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil,tp) end
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0) Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
end end
function c21692418.hspop(e,tp,eg,ep,ev,re,r,rp) function c21692418.hspop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local tc=Duel.SelectMatchingCard(tp,c21692418.sthfil,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil,tp):GetFirst() local tc=Duel.SelectMatchingCard(tp,c21692418.sthfil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil,tp):GetFirst()
if tc and Duel.SendtoHand(tc,nil,REASON_EFFECT)~=0 and c:IsRelateToEffect(e) then if tc and Duel.SendtoHand(tc,nil,REASON_EFFECT)~=0 and c:IsRelateToEffect(e) then
Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
end end
......
...@@ -37,7 +37,7 @@ function c44401003.condition(e,tp,eg,ep,ev,re,r,rp) ...@@ -37,7 +37,7 @@ function c44401003.condition(e,tp,eg,ep,ev,re,r,rp)
return ph==PHASE_MAIN1 or ph==PHASE_MAIN2 return ph==PHASE_MAIN1 or ph==PHASE_MAIN2
end end
function c44401003.cfilter(c,e,tp,check) function c44401003.cfilter(c,e,tp,check)
return c:IsRace(RACE_PSYCHO) and ((c:IsLocation(LOCATION_HAND+LOCATION_MZONE) and c:IsSummonable(true,nil)) or (check and c:IsLocation(LOCATION_DECK+LOCATION_REMOVED) and c:IsFaceupEx() and Duel.GetMZoneCount(tp)>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false))) return c:IsRace(RACE_PSYCHO) and c:IsLocation(LOCATION_HAND+LOCATION_MZONE) and c:IsSummonable(true,nil) or check and c:IsSetCard(0xa4a) and c:IsLocation(LOCATION_DECK+LOCATION_REMOVED) and c:IsFaceupEx() and Duel.GetMZoneCount(tp)>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function c44401003.target(e,tp,eg,ep,ev,re,r,rp,chk) function c44401003.target(e,tp,eg,ep,ev,re,r,rp,chk)
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