Merge branch 'master' of git.mycard.moe:alstroemeria-silentlove/ygopro-222DIY-cards into 2021.2.28

expansions/script/c66619901.lua

@@ -35,8 +35,8 @@ function c66619901.cfilter(c)
 end
 function c66619901.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_DECK+LOCATION_GRAVE) and chkc:IsControler(tp) and c66619901.filter1(chkc) end
-	local b1=Duel.IsExistingTarget(c66619901.filter1,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil)
-	local b2=Duel.IsExistingMatchingCard(c66619901.filter2,tp,LOCATION_DECK,0,1,nil) and Duel.IsExistingTarget(c66619901.cfilter,tp,LOCATION_SZONE,0,1,nil)
+	local b1=Duel.IsExistingMatchingCard(c66619901.filter1,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil)
+	local b2=Duel.IsExistingMatchingCard(c66619901.filter2,tp,LOCATION_DECK,0,1,nil) and Duel.IsExistingMatchingCard(c66619901.cfilter,tp,LOCATION_SZONE,0,1,nil)
 	if chk==0 then return b1 or b2 end
 	local op=0
 	if b1 and b2 then op=Duel.SelectOption(tp,aux.Stringid(66619901,0),aux.Stringid(66619901,1))

expansions/script/c66619904.lua

@@ -42,14 +42,13 @@ function c66619904.cfilter(c)
 end
 function c66619904.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
     if chkc then return chkc:IsLocation(LOCATION_DECK+LOCATION_GRAVE) and chkc:IsControler(tp) and c66619904.filter1(chkc) and Duel.GetMZoneCount(tp)>0 end
-	local b1=Duel.IsExistingTarget(c66619904.filter1,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil)
-	local b2=Duel.IsExistingTarget(c66619904.filter2,tp,LOCATION_GRAVE,0,1,nil,e,tp) and Duel.IsExistingTarget(c66619904.cfilter,tp,LOCATION_ONFIELD,0,1,nil)
-	if chk==0 then return b1 or b2 and Duel.IsExistingTarget(c66619904.filter2,tp,LOCATION_GRAVE,0,1,nil,e,tp) end
+    local b1=Duel.IsExistingMatchingCard(c66619904.filter1,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil)
+    local b2=Duel.IsExistingMatchingCard(c66619904.filter2,tp,LOCATION_GRAVE,0,1,nil,e,tp) and Duel.IsExistingMatchingCard(c66619904.cfilter,tp,LOCATION_ONFIELD,0,1,nil)
+    if chk==0 then return b1 or b2 and Duel.IsExistingMatchingCard(c66619904.filter2,tp,LOCATION_GRAVE,0,1,nil,e,tp) end
     local op=0
     if b1 and b2 then op=Duel.SelectOption(tp,aux.Stringid(66619904,0),aux.Stringid(66619904,1))
     elseif b1 then op=Duel.SelectOption(tp,aux.Stringid(66619904,0))
     else op=Duel.SelectOption(tp,aux.Stringid(66619904,1))+1 end
-	e:SetLabel(op)
     if op==0 then
         e:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
         Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)
@@ -57,8 +56,11 @@ function c66619904.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
         e:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
         local g=Duel.SelectMatchingCard(tp,c66619904.cfilter,tp,LOCATION_ONFIELD,0,1,1,nil)
         Duel.SendtoGrave(g,REASON_EFFECT)
+        Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+        local g=Duel.SelectTarget(tp,c66619904.filter2,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
         Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE)
     end
+    e:SetLabel(op)
 end
 function c66619904.thop(e,tp,eg,ep,ev,re,r,rp)
         local c=e:GetHandler()
@@ -71,8 +73,6 @@ function c66619904.thop(e,tp,eg,ep,ev,re,r,rp)
         end
     else
         if Duel.GetMZoneCount(tp)<=0 then return end
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-		local g=Duel.SelectTarget(tp,c66619904.filter2,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
         local tc=Duel.GetFirstTarget()
         if tc:IsRelateToEffect(e) then
             Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)