Push by Appveyor

expansions/script/c46564059.lua

@@ -14,7 +14,7 @@ function cm.initial_effect(c)
     e2:SetType(EFFECT_TYPE_IGNITION)
     e2:SetRange(LOCATION_FZONE)
     e2:SetCountLimit(1,m)
-	e2:SetCost(cm.thcost)
+    e2:SetCondition(cm.condition)
     e2:SetTarget(cm.thtg)
     e2:SetOperation(cm.thop)
     c:RegisterEffect(e2)
@@ -44,21 +44,23 @@ end
 function cm.dfilter(c)
     return c:IsSetCard(0x65c) and c:IsAbleToGraveAsCost()
 end
-function cm.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.dfilter,tp,LOCATION_HAND,0,1,nil) end
-	Duel.DiscardHand(tp,cm.dfilter,1,1,REASON_COST+REASON_DISCARD)
+function cm.cfilter(c)
+    return c:IsFaceup() and c:IsSetCard(0x65c)
+end
+function cm.condition(e,tp,eg,ep,ev,re,r,rp)
+    return Duel.IsExistingMatchingCard(cm.cfilter,tp,LOCATION_MZONE,0,2,nil)
 end
 function cm.thfilter(c)
     return c:IsSetCard(0x65c) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_DECK,0,1,nil) end
-	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
+    if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end
+    Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE)
 end
 function cm.thop(e,tp,eg,ep,ev,re,r,rp)
     if not e:GetHandler():IsRelateToEffect(e) then return end
     Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	local g=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_DECK,0,1,1,nil)
+    local g=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
     if g:GetCount()>0 then
         Duel.SendtoHand(g,nil,REASON_EFFECT)
         Duel.ConfirmCards(1-tp,g)