23.9.20 yume fix&upd

expansions/script/c71401008.lua

@@ -16,6 +16,7 @@ function c71401008.initial_effect(c)
 	--place
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(71401008,0))
+	e2:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE+TIMING_EQUIP)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetRange(LOCATION_MZONE)

expansions/script/c71401009.lua

@@ -18,7 +18,7 @@ function c71401009.initial_effect(c)
 	e2:SetCategory(CATEGORY_REMOVE)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_FREE_CHAIN)
-	e2:SetHintTiming(0,TIMING_END_PHASE+TIMING_EQUIP)
+	e2:SetHintTiming(0,TIMING_END_PHASE+TIMING_EQUIP+TIMING_SSET)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1,71401009)
 	e2:SetCost(c71401009.cost2)

expansions/script/c71401013.lua

@@ -60,8 +60,8 @@ function c71401013.op2(e,tp,eg,ep,ev,re,r,rp)
 			e1:SetValue(-2000)
 			sc:RegisterEffect(e1)
 		end
-		local dg=Duel.GetDecktopGroup(tp,3)
-		if Duel.IsExistingMatchingCard(c71401013.filter2,tp,LOCATION_ONFIELD,0,1,nil) and dg:FilterCount(Card.IsAbleToRemove,nil,tp,POS_FACEDOWN)==3 and Duel.SelectYesNo(tp,aux.Stringid(71401013,1)) then
+		local dg=Duel.GetDecktopGroup(tp,5)
+		if Duel.IsExistingMatchingCard(c71401013.filter2,tp,LOCATION_ONFIELD,0,1,nil) and dg:FilterCount(Card.IsAbleToRemove,nil,tp,POS_FACEDOWN)==5 and Duel.SelectYesNo(tp,aux.Stringid(71401013,1)) then
 			Duel.Remove(dg,POS_FACEDOWN,REASON_EFFECT)
 		end
 	end

expansions/script/c71401014.lua

@@ -30,9 +30,8 @@ function c71401014.initial_effect(c)
 	e3:SetCategory(CATEGORY_REMOVE)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetCode(EVENT_FREE_CHAIN)
-	e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e3:SetRange(LOCATION_SZONE)
-	e3:SetCountLimit(1,71501009)
+	e3:SetCountLimit(1,71501014)
 	e3:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE)
 	e3:SetCondition(c71401014.con3)
 	e3:SetCost(yume.ButterflyLimitCost)
@@ -50,32 +49,34 @@ function c71401014.chainop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c71401014.chainlm(e,rp,tp)
-	return tp==rp or e:GetHandler():GetOriginalType()&TYPE_MONSTER==0
+	local c=e:GetHandler()
+	return tp==rp or c:GetOriginalType()&TYPE_MONSTER==0 and c:IsLocation(LOCATION_ONFIELD)
 end
-function c71401014.filter2(c,e,tp)
-	return c:GetOriginalType()&TYPE_MONSTER~=0 and c:IsAbleToRemove(tp,POS_FACEDOWN) and not c:IsImmuneToEffect(e)
-		and Duel.IsExistingMatchingCard(Card.IsAbleToRemove,0,LOCATION_ONFIELD+LOCATION_GRAVE,LOCATION_ONFIELD+LOCATION_GRAVE,1,c,tp,POS_FACEDOWN)
+function c71401014.filter2(c,e,tp,ac)
+	return c:GetOriginalType()&TYPE_MONSTER~=0 and (c:IsFaceup() or c:IsLocation(LOCATION_MZONE)) and c:IsAbleToRemove(tp,POS_FACEDOWN) and not c:IsImmuneToEffect(e)
+		and Duel.IsExistingMatchingCard(Card.IsAbleToRemove,0,LOCATION_ONFIELD+LOCATION_GRAVE,LOCATION_ONFIELD+LOCATION_GRAVE,1,Group.FromCards(c,ac),tp,POS_FACEDOWN)
 end
 function c71401014.op2(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) and not c:IsImmuneToEffect(e) and Duel.GetLocationCount(tp,LOCATION_SZONE)>0 then
 		local ct=c:GetOverlayCount()
 		if Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true) then
-			local e2=Effect.CreateEffect(c)
-			e2:SetCode(EFFECT_CHANGE_TYPE)
-			e2:SetType(EFFECT_TYPE_SINGLE)
-			e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-			e2:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET)
-			e2:SetValue(TYPE_TRAP+TYPE_CONTINUOUS)
-			c:RegisterEffect(e2)
-			local mg=Duel.GetMatchingGroup(c71401014.filter2,tp,LOCATION_ONFIELD,0,c,e,tp)
+			local e1=Effect.CreateEffect(c)
+			e1:SetCode(EFFECT_CHANGE_TYPE)
+			e1:SetType(EFFECT_TYPE_SINGLE)
+			e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+			e1:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET)
+			e1:SetValue(TYPE_TRAP+TYPE_CONTINUOUS)
+			c:RegisterEffect(e1)
+			local mg=Duel.GetMatchingGroup(c71401014.filter2,tp,LOCATION_ONFIELD,0,c,e,tp,c)
 			if ct>0 and mg:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(71401014,0)) then
 				Duel.BreakEffect()
 				Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 				local rg1=mg:Select(tp,1,1,c)
+				local rc1=rg1:GetFirst()
 				Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-				local rg2=Duel.SelectMatchingCard(tp,Card.IsAbleToRemove,0,LOCATION_ONFIELD+LOCATION_GRAVE,LOCATION_ONFIELD+LOCATION_GRAVE,1,ct,rg1,tp,POS_FACEDOWN)
-				rg2:Merge(rg1)
+				local rg2=Duel.SelectMatchingCard(tp,Card.IsAbleToRemove,0,LOCATION_ONFIELD+LOCATION_GRAVE,LOCATION_ONFIELD+LOCATION_GRAVE,1,ct,Group.FromCards(rc1,c),tp,POS_FACEDOWN)
+				rg2:AddCard(rc1)
 				Duel.Remove(rg2,POS_FACEDOWN,REASON_EFFECT)
 			end
 		end
@@ -85,24 +86,25 @@ function c71401014.con3(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetType()==TYPE_TRAP+TYPE_CONTINUOUS
 end
 function c71401014.filter3(c,tp,ac)
-	return c:GetOriginalType()&TYPE_MONSTER~=0 and c:IsAbleToRemove(tp,POS_FACEDOWN)
+	return c:GetOriginalType()&TYPE_MONSTER~=0 and (c:IsFaceup() or c:IsLocation(LOCATION_MZONE)) and c:IsAbleToRemove(tp,POS_FACEDOWN)
 		and Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,Group.FromCards(c,ac),tp,POS_FACEDOWN)
 end
-function c71401014.tg3(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocation(LOCATION_ONFIELD) and c71401014.filter3(chkc,tp,e:GetHandler()) end
-	if chk==0 then return Duel.IsExistingTarget(c71401014.filter3,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil,tp,e:GetHandler()) end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	local g=Duel.SelectTarget(tp,c71401014.filter3,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil,tp,e:GetHandler())
-	Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,1,0,0)
+function c71401014.tg3(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then
+		local c=e:GetHandler()
+		return Duel.IsExistingMatchingCard(c71401014.filter3,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,c,tp,c)
+	end
+	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,2,0,LOCATION_ONFIELD+LOCATION_HAND)
 end
 function c71401014.op3(e,tp,eg,ep,ev,re,r,rp)
-	local tc=Duel.GetFirstTarget()
-	if tc:IsRelateToEffect(e) then
+	local c=e:GetHandler()
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
+	local g=Duel.SelectMatchingCard(tp,c71401014.filter3,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil,tp,c)
+	if g:GetCount()>0 then
+		local tc=g:GetFirst()
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-		local rg=Duel.SelectMatchingCard(tp,Card.IsAbleToRemove,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,1,Group.FromCards(tc,e:GetHandler()),tp,POS_FACEDOWN)
-		if rg:GetCount()>0 then
-			rg:AddCard(tc)
-			Duel.Remove(rg,POS_FACEUP,POS_FACEDOWN)
-		end
+		local rg=Duel.SelectMatchingCard(tp,Card.IsAbleToRemove,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,1,Group.FromCards(tc,c),tp,POS_FACEDOWN)
+		rg:AddCard(tc)
+		Duel.Remove(rg,POS_FACEUP,POS_FACEDOWN)
 	end
 end
\ No newline at end of file