Commit 5f676624 authored by mercury233's avatar mercury233

fix

parent ddb72420
...@@ -17,7 +17,6 @@ function c100259009.initial_effect(c) ...@@ -17,7 +17,6 @@ function c100259009.initial_effect(c)
e1:SetCategory(CATEGORY_DAMAGE) e1:SetCategory(CATEGORY_DAMAGE)
e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e1:SetCode(EVENT_BATTLE_CONFIRM) e1:SetCode(EVENT_BATTLE_CONFIRM)
e1:SetRange(LOCATION_MZONE)
e1:SetCondition(c100259009.damcon) e1:SetCondition(c100259009.damcon)
e1:SetTarget(c100259009.damtg) e1:SetTarget(c100259009.damtg)
e1:SetOperation(c100259009.damop) e1:SetOperation(c100259009.damop)
......
...@@ -82,21 +82,25 @@ function c100337051.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -82,21 +82,25 @@ function c100337051.disop(e,tp,eg,ep,ev,re,r,rp)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
end end
end end
function c100337051.thfilter(c) function c100337051.thfilter(c,tp)
local b=c:IsType(TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK)
return c:IsSetCard(0x9d) and c:IsAbleToHand() and (not b or (b and Duel.GetFieldGroupCount(tp,LOCATION_HAND,0)>0))
end
function c100337051.thfilter2(c)
return c:IsSetCard(0x9d) and c:IsAbleToHand() return c:IsSetCard(0x9d) and c:IsAbleToHand()
end end
function c100337051.thtg(e,tp,eg,ep,ev,re,r,rp,chk) function c100337051.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c100337051.thfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(c100337051.thfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil,tp) end
Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE) Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE)
Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,1,tp,1) Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,1,tp,1)
end end
function c100337051.thop(e,tp,eg,ep,ev,re,r,rp) function c100337051.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c100337051.thfilter),tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil) local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c100337051.thfilter2),tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
if g:GetFirst():IsLocation(LOCATION_HAND) then if g:GetFirst():IsLocation(LOCATION_HAND+LOCATION_EXTRA) then
Duel.ShuffleHand(tp) Duel.ShuffleHand(tp)
Duel.BreakEffect() Duel.BreakEffect()
Duel.DiscardHand(tp,aux.TRUE,1,1,REASON_EFFECT+REASON_DISCARD,nil) Duel.DiscardHand(tp,aux.TRUE,1,1,REASON_EFFECT+REASON_DISCARD,nil)
......
...@@ -45,7 +45,7 @@ function c100423001.drop(e,tp,eg,ep,ev,re,r,rp) ...@@ -45,7 +45,7 @@ function c100423001.drop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if Duel.Draw(tp,1,REASON_EFFECT)~=0 then if Duel.Draw(tp,1,REASON_EFFECT)~=0 then
local dc=Duel.GetOperatedGroup():GetFirst() local dc=Duel.GetOperatedGroup():GetFirst()
if dc:IsType(TYPE_SPELL+TYPE_TRAP) and dc:IsSSetable() if dc:IsSSetable()
and Duel.SelectYesNo(tp,aux.Stringid(100423001,0)) then and Duel.SelectYesNo(tp,aux.Stringid(100423001,0)) then
Duel.SSet(tp,dc) Duel.SSet(tp,dc)
if dc:IsType(TYPE_QUICKPLAY) then if dc:IsType(TYPE_QUICKPLAY) then
...@@ -64,7 +64,6 @@ function c100423001.drop(e,tp,eg,ep,ev,re,r,rp) ...@@ -64,7 +64,6 @@ function c100423001.drop(e,tp,eg,ep,ev,re,r,rp)
e1:SetReset(RESET_EVENT+RESETS_STANDARD) e1:SetReset(RESET_EVENT+RESETS_STANDARD)
dc:RegisterEffect(e1) dc:RegisterEffect(e1)
end end
Duel.ConfirmCards(1-tp,dc)
end end
end end
end end
......
...@@ -2,7 +2,7 @@ ...@@ -2,7 +2,7 @@
--Scripted by nekrozar --Scripted by nekrozar
function c101011022.initial_effect(c) function c101011022.initial_effect(c)
c:SetUniqueOnField(1,0,101011022) c:SetUniqueOnField(1,0,101011022,LOCATION_MZONE)
--remove --remove
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(101011022,0)) e1:SetDescription(aux.Stringid(101011022,0))
......
...@@ -75,7 +75,7 @@ function c101011026.spop2(e,tp,eg,ep,ev,re,r,rp) ...@@ -75,7 +75,7 @@ function c101011026.spop2(e,tp,eg,ep,ev,re,r,rp)
e1:SetReset(RESET_EVENT+RESETS_REDIRECT) e1:SetReset(RESET_EVENT+RESETS_REDIRECT)
e1:SetValue(LOCATION_REMOVED) e1:SetValue(LOCATION_REMOVED)
tc:RegisterEffect(e1,true) tc:RegisterEffect(e1,true)
if c:IsFaceup() and c:IsRelateToEffect(e) and c:IsAbleToRemove() then if c:IsFaceup() and c:IsRelateToEffect(e) then
Duel.BreakEffect() Duel.BreakEffect()
if Duel.Remove(c,POS_FACEUP,REASON_EFFECT+REASON_TEMPORARY)~=0 then if Duel.Remove(c,POS_FACEUP,REASON_EFFECT+REASON_TEMPORARY)~=0 then
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
......
...@@ -25,7 +25,6 @@ function c101011049.initial_effect(c) ...@@ -25,7 +25,6 @@ function c101011049.initial_effect(c)
e3:SetCategory(CATEGORY_TODECK) e3:SetCategory(CATEGORY_TODECK)
e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e3:SetCode(EVENT_BATTLE_START) e3:SetCode(EVENT_BATTLE_START)
e3:SetRange(LOCATION_MZONE)
e3:SetCondition(c101011049.tdcon) e3:SetCondition(c101011049.tdcon)
e3:SetTarget(c101011049.tdtg) e3:SetTarget(c101011049.tdtg)
e3:SetOperation(c101011049.tdop) e3:SetOperation(c101011049.tdop)
......
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