Merge branch 'master' of git.mycard.moe:mycard/pre-release-database-cdb

pack/2024-07-27 ROTA(1206).ydk

@@ -20,12 +20,15 @@
 101206018
 101206019
 101206020
+101206021
 101206022
 101206023
 101206024
 101206025
+101206026
 101206027
 101206028
+101206029
 101206030
 101206031
 101206032
@@ -40,6 +43,7 @@
 101206204
 101206205
 101206043
+101206044
 101206045
 101206046
 101206047
@@ -61,6 +65,7 @@
 101206064
 101206065
 101206066
+101206067
 101206208
 101206209
 101206070
@@ -73,3 +78,4 @@
 101206077
 101206078
 101206079
+101206080
\ No newline at end of file

script/c101205096.lua

@@ -36,7 +36,7 @@ function s.posfilter(c)
 	return c:IsFaceup() and c:IsCanTurnSet()
 end
 function s.activate(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.GetLocationCount(tp,LOCATION_MZONE) + Duel.GetLocationCount(1-tp,LOCATION_MZONE) <= 0 then return end
+	if Duel.GetLocationCount(tp,LOCATION_MZONE)+Duel.GetLocationCount(1-tp,LOCATION_MZONE)<=0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_HAND+LOCATION_DECK,0,1,1,nil,e,tp)
 	if g:GetCount()>0 then

script/c101206018.lua

@@ -24,8 +24,11 @@ function s.initial_effect(c)
 	e2:SetOperation(s.spop)
 	c:RegisterEffect(e2)
 end
+function s.lvcfilter(c)
+	return c:IsAbleToGraveAsCost() and c:IsDiscardable()
+end
 function s.lvcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToGraveAsCost,tp,LOCATION_HAND,0,1,e:GetHandler()) end
+	if chk==0 then return Duel.IsExistingMatchingCard(s.lvcfilter,tp,LOCATION_HAND,0,1,e:GetHandler()) end
 	Duel.DiscardHand(tp,Card.IsAbleToGraveAsCost,1,1,REASON_COST)
 end
 function s.lvfilter(c)

script/c101206021.lua

@@ -34,13 +34,16 @@ function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local sg=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_ONFIELD,0,nil)
 	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,sg,sg:GetCount(),0,0)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
-	Duel.SetChainLimit(aux.FALSE)
+	Duel.SetChainLimit(s.climit)
+end
+function s.climit(c)
+	return not c:IsType(TYPE_MONSTER)
 end
 function s.spop(e,tp,eg,ep,ev,re,r,rp)
 	local sg=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_ONFIELD,0,nil)
 	if Duel.SendtoGrave(sg,REASON_EFFECT)~=0 then
 		local g=Duel.GetOperatedGroup()
-		local ct=g:Filter(Card.IsLocation,nil,LOCATION_GRAVE)
+		local ct=g:Filter(Card.IsLocation,nil,LOCATION_GRAVE):GetCount()
 		if ct~=0 and e:GetHandler():IsRelateToEffect(e) and Duel.SpecialSummon(e:GetHandler(),0,tp,tp,false,false,POS_FACEUP)~=0
 			and Duel.IsExistingMatchingCard(Card.IsAbleToGrave,tp,0,LOCATION_ONFIELD,1,nil) then
 			Duel.BreakEffect()
@@ -56,7 +59,9 @@ function s.tgcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function s.tgcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToGraveAsCost,tp,LOCATION_HAND,0,1,e:GetHandler()) end
-	Duel.DiscardHand(tp,Card.IsAbleToGraveAsCost,1,1,REASON_COST)
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
+	local g=Duel.SelectMatchingCard(tp,Card.IsAbleToGraveAsCost,tp,LOCATION_HAND,0,1,1,nil)
+	Duel.SendtoGrave(g,REASON_COST)
 end
 function s.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToGrave,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) end