Commit ed0e255e authored by TanakaKotoha's avatar TanakaKotoha

fix

parent e170ad0f
......@@ -18,7 +18,7 @@ end
function cm.desop(e,tp)
local c=e:GetHandler()
local bc=c:GetBattleTarget()
if bc:IsFacedown() or not bc:IsRace(RACE_WARRIOR) then
if bc and (bc:IsFacedown() or not bc:IsRace(RACE_WARRIOR)) then
rshint.Card(m)
if Duel.Destroy(bc,REASON_EFFECT)>0 then
local atk = bc:GetBaseAttack()
......
......@@ -85,8 +85,9 @@ function cm.sumop(e,tp)
local tc=Duel.SelectMatchingCard(tp,cm.sumfilter,tp,LOCATION_HAND,0,1,1,nil):GetFirst()
if tc then
local code = tc:GetOriginalCodeRule()
tc:RegisterFlagEffect(code + 100,rsreset.est-RESET_TOFIELD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(16104200,2))
if rsch.IsSet2(c) and tc:GetOriginalLevel()>=6 then
tc:RegisterFlagEffect(code + 100,rsreset.est-RESET_TOFIELD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(16104200,2))
end
Duel.Summon(tp,tc,true,nil)
end
end
\ No newline at end of file
......@@ -6,7 +6,7 @@ function cm.initial_effect(c)
rsch.LimitFun(c,m)
local e1=rsch.GainEffect(c,m)
local e2=rsef.QO(c,nil,{m,0},nil,nil,nil,LOCATION_HAND,nil,rsch.limitcost(m,rscost.cost(Card.IsDiscardable,"dish")),rsop.target(cm.cfilter,nil,LOCATION_HAND,0,1,1,c),cm.sumop)
local e3=rsef.QO(c,nil,{m,1},nil,"dr,tg",nil,LOCATION_HAND,nil,rsch.limitcost(m,rscost.cost(0,"dish")),rsop.target(1,"dr"),cm.drop)
local e3=rsef.I(c,{m,1},nil,"dr,tg",nil,LOCATION_HAND,nil,rsch.limitcost(m,rscost.cost(0,"dish")),rsop.target(1,"dr"),cm.drop)
local e4=rsef.QO(c,nil,{m,2},1,"rm",nil,LOCATION_MZONE,rsch.gaincon(m),nil,rsop.target(Card.IsAbleToRemove,"rm",LOCATION_ONFIELD,LOCATION_ONFIELD),cm.rmop)
end
function cm.cfilter(c)
......
......@@ -43,7 +43,9 @@ function cm.op(e,tp)
else
if rssf.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP,nil,nil,"th")>0 then
local code = tc:GetOriginalCodeRule()
tc:RegisterFlagEffect(code + 100,rsreset.est,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(16104200,2))
if rsch.IsSet2(c) and tc:GetOriginalLevel()>=6 then
tc:RegisterFlagEffect(code + 100,rsreset.est,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(16104200,2))
end
end
end
end
......
......@@ -6,7 +6,7 @@ function cm.initial_effect(c)
local e2=rsef.I(c,{m,0},{1,m+100},"td,dr",nil,LOCATION_GRAVE,nil,nil,rsop.target({Card.IsAbleToDeck,"td"},{cm.tdfilter,"td",LOCATION_GRAVE+LOCATION_REMOVED }),cm.drop)
end
function cm.tgfilter(c)
return c:IsAbleToGrave() and c:IsFaceup() and rsch.IsSet1(c)
return c:IsAbleToGrave() and c:IsFaceup() and rsch.IsSet2(c)
end
function cm.act(e,tp)
local g=Duel.GetMatchingGroup(cm.tgfilter,tp,LOCATION_MZONE,0,nil)
......@@ -23,9 +23,9 @@ end
function cm.drop(e,tp)
local c=rscf.GetSelf(e)
if not c then return end
rsop.SelectSolve(HINTMSG_TODECK,tp,aux.NecroValleyFilter(cm.tdfilter),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,2,c,cm.solvefun,c)
rsop.SelectSolve(HINTMSG_TODECK,tp,aux.NecroValleyFilter(cm.tdfilter),tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,2,c,cm.solvefun,c,tp)
end
function cm.solvefun(g,c)
function cm.solvefun(g,c,tp)
g:AddCard(c)
if Duel.SendtoDeck(g,nil,2,REASON_EFFECT)>0 and Duel.GetOperatedGroup():IsExists(Card.IsLocation,1,nil,rsloc.de) then
if Duel.GetOperatedGroup():IsExists(Card.IsLocation,1,nil,LOCATION_DECK) then
......
......@@ -33,7 +33,7 @@ function cm.setop(e,tp)
Duel.ConfirmCards(1-tp,sg)
rshint.Select(1-tp,HINTMSG_SET)
local tg=sg:Select(1-tp,1,1,nil)
Duel.HintSelection(tg)
--Duel.HintSelection(tg)
Duel.SSet(tp,tg:GetFirst())
sg:Sub(tg)
Duel.SendtoGrave(sg,REASON_EFFECT)
......
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