Commit a8336f5b authored by POLYMER's avatar POLYMER

fix

parent b85f110d
......@@ -2107,7 +2107,6 @@
70002043 0
10105695 0
10105696 0
11451419 0
88881922 0
#240602
11451867 2
......
......@@ -65,7 +65,6 @@ function c28323723.thop(e,tp,eg,ep,ev,re,r,rp)
local tg=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c28323723.thfilter),tp,LOCATION_DECK+LOCATION_GRAVE,0,2,2,nil)
if Duel.SendtoHand(tg,nil,REASON_EFFECT)==0 then return end
Duel.ConfirmCards(1-tp,tg)
Duel.ShuffleHand(tp)
if tc:IsRelateToEffect(e) then Duel.SendtoDeck(tc,nil,SEQ_DECKSHUFFLE,REASON_EFFECT) end
local b1,b2,b3,b4=false
local b5=true
......@@ -80,10 +79,14 @@ function c28323723.thop(e,tp,eg,ep,ev,re,r,rp)
{b3,aux.Stringid(28323723,2)},
{b4,aux.Stringid(28323723,3)},
{b5,aux.Stringid(28323723,4)})
if op~=5 then Duel.BreakEffect() end
if op~=5 then
Duel.BreakEffect()
Duel.ShuffleHand(tp)
end
if op==1 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
local g=Duel.SelectMatchingCard(tp,c28323723.stfilter,tp,LOCATION_HAND,0,2,2,nil)
Duel.ConfirmCards(1-tp,g)
Duel.BreakEffect()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
local g=Duel.SelectMatchingCard(tp,c28323723.ctfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,c)
......@@ -91,6 +94,7 @@ function c28323723.thop(e,tp,eg,ep,ev,re,r,rp)
elseif op==2 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
local g=Duel.SelectMatchingCard(tp,c28323723.nofilter,tp,LOCATION_HAND,0,2,2,nil)
Duel.ConfirmCards(1-tp,g)
Duel.BreakEffect()
Duel.ShuffleHand(tp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
......@@ -104,6 +108,7 @@ function c28323723.thop(e,tp,eg,ep,ev,re,r,rp)
elseif op==3 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
local g=Duel.SelectMatchingCard(tp,c28323723.shfilter,tp,LOCATION_HAND,0,2,2,nil)
Duel.ConfirmCards(1-tp,g)
Duel.BreakEffect()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(tp,c28323723.exfilter,tp,LOCATION_EXTRA,0,1,1,nil)
......@@ -114,6 +119,7 @@ function c28323723.thop(e,tp,eg,ep,ev,re,r,rp)
elseif op==4 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
local g=Duel.SelectMatchingCard(tp,c28323723.cofilter,tp,LOCATION_HAND,0,2,2,nil)
Duel.ConfirmCards(1-tp,g)
Duel.BreakEffect()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local g=Duel.SelectMatchingCard(tp,c28323723.rmfilter,tp,LOCATION_GRAVE,0,1,1,nil)
......
......@@ -40,6 +40,7 @@ function c28346765.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c28346765.cfilter,tp,LOCATION_HAND,0,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(28346765,0))
local pc=Duel.SelectMatchingCard(tp,c28346765.cfilter,tp,LOCATION_HAND,0,1,1,nil):GetFirst()
Duel.ConfirmCards(1-tp,pc)
local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_PUBLIC)
......@@ -59,7 +60,7 @@ function c28346765.setop(e,tp,eg,ep,ev,re,r,rp)
if sc then Duel.SSet(tp,sc) end
end
function c28346765.spfilter(c,e,tp)
return c:IsSetCard(0x283) and c:GetOriginalLevel()<=4 and c:GetOriginalLevel()>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
return c:IsSetCard(0x283) and c:IsSummonableCard() and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end
function c28346765.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c28346765.spfilter(chkc,e,tp) end
......
......@@ -58,7 +58,6 @@ function c28381214.thop(e,tp,eg,ep,ev,re,r,rp)
local tg=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c28381214.thfilter),tp,LOCATION_DECK+LOCATION_GRAVE,0,2,2,nil)
if Duel.SendtoHand(tg,nil,REASON_EFFECT)==0 then return end
Duel.ConfirmCards(1-tp,tg)
Duel.ShuffleHand(tp)
if tc:IsRelateToEffect(e) then Duel.SendtoDeck(tc,nil,SEQ_DECKSHUFFLE,REASON_EFFECT) end
local b1,b2,b3,b4=false
local b5=true
......@@ -73,10 +72,14 @@ function c28381214.thop(e,tp,eg,ep,ev,re,r,rp)
{b3,aux.Stringid(28381214,2)},
{b4,aux.Stringid(28381214,3)},
{b5,aux.Stringid(28381214,4)})
if op~=5 then Duel.BreakEffect() end
if op~=5 then
Duel.BreakEffect()
Duel.ShuffleHand(tp)
end
if op==1 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
local g=Duel.SelectMatchingCard(tp,c28381214.ilfilter,tp,LOCATION_HAND,0,2,2,nil)
Duel.ConfirmCards(1-tp,g)
Duel.BreakEffect()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
local g=Duel.SelectMatchingCard(tp,c28381214.tgfilter,tp,LOCATION_DECK,0,1,1,nil)
......@@ -84,6 +87,7 @@ function c28381214.thop(e,tp,eg,ep,ev,re,r,rp)
elseif op==2 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
local g=Duel.SelectMatchingCard(tp,c28381214.anfilter,tp,LOCATION_HAND,0,2,2,nil)
Duel.ConfirmCards(1-tp,g)
Duel.BreakEffect()
Duel.Damage(tp,500,REASON_EFFECT,true)
Duel.Damage(1-tp,500,REASON_EFFECT,true)
......@@ -92,6 +96,7 @@ function c28381214.thop(e,tp,eg,ep,ev,re,r,rp)
if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
local g=Duel.SelectMatchingCard(tp,c28381214.hkfilter,tp,LOCATION_HAND,0,2,2,nil)
Duel.ConfirmCards(1-tp,g)
Duel.BreakEffect()
Duel.ShuffleHand(tp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
......@@ -100,6 +105,7 @@ function c28381214.thop(e,tp,eg,ep,ev,re,r,rp)
elseif op==4 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
local g=Duel.SelectMatchingCard(tp,c28381214.alfilter,tp,LOCATION_HAND,0,2,2,nil)
Duel.ConfirmCards(1-tp,g)
Duel.BreakEffect()
Duel.Recover(tp,500,REASON_EFFECT)
end
......
......@@ -45,7 +45,7 @@ function c67200755.activate(e,tp,eg,ep,ev,re,r,rp)
end
--
function c67200755.thfilter(c)
return c:IsSetCard(0x367d) and IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()
return c:IsSetCard(0x367d) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToHand()
end
function c67200755.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c67200755.thfilter,tp,LOCATION_REMOVED,0,1,nil) 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