Commit d3df3047 authored by wind2009's avatar wind2009

Fix キラーチューン・プレイリスト

parent b3f1803e
Pipeline #40439 passed with stages
in 3 minutes and 1 second
...@@ -73,7 +73,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -73,7 +73,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
if tc:IsAbleToHand() and (not tc:IsCanBeSpecialSummoned(e,0,tp,false,false) or ft<=0 or Duel.SelectOption(tp,1190,1152)==0) then if tc:IsAbleToHand() and (not tc:IsCanBeSpecialSummoned(e,0,tp,false,false) or ft<=0 or Duel.SelectOption(tp,1190,1152)==0) then
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,tc) Duel.ConfirmCards(1-tp,tc)
else elseif tc:IsCanBeSpecialSummoned(e,0,tp,false,false) then
Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP) Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
end end
end end
......
...@@ -19,13 +19,18 @@ function s.filter(c,e,tp,eg,ep,ev,re,r,rp) ...@@ -19,13 +19,18 @@ function s.filter(c,e,tp,eg,ep,ev,re,r,rp)
local te=c.killer_tune_be_material_effect local te=c.killer_tune_be_material_effect
if not te then return c:IsAbleToHand() end if not te then return c:IsAbleToHand() end
local tg=te:GetTarget() local tg=te:GetTarget()
return tg(e,tp,eg,ep,ev,re,r,rp,0,nil,c) or c:IsAbleToHand() return c:IsAbleToHand() or tg(e,tp,eg,ep,ev,re,r,rp,0,nil,c)
end end
function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then if chkc then
local te=e:GetLabelObject() local cc=e:GetLabelObject()
local tg=te:GetTarget() if cc and cc.killer_tune_be_material_effect then
local ce=cc.killer_tune_be_material_effect
local tg=ce:GetTarget()
return tg and tg(e,tp,eg,ep,ev,re,r,rp,0,chkc) return tg and tg(e,tp,eg,ep,ev,re,r,rp,0,chkc)
else
return chkc:IsFaceupEx() and chkc:IsControler(tp) and chkc:IsSetCard(0x2d6) and chkc:IsType(TYPE_MONSTER) and chkc:IsAbleToHand()
end
end end
if chk==0 then return Duel.IsExistingTarget(s.filter,tp,LOCATION_GRAVE+LOCATION_MZONE,0,1,nil,e,tp,eg,ep,ev,re,r,rp) end if chk==0 then return Duel.IsExistingTarget(s.filter,tp,LOCATION_GRAVE+LOCATION_MZONE,0,1,nil,e,tp,eg,ep,ev,re,r,rp) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
......
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