23.10.7 yume fix&upd

expansions/script/c71401008.lua

@@ -17,7 +17,7 @@ function c71401008.initial_effect(c)
 	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:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1,71401008)
@@ -39,7 +39,7 @@ function c71401008.initial_effect(c)
 	yume.ButterflyCounter()
 end
 function c71401008.indtg(e,c)
-	return c:GetOriginalType()&TYPE_MONSTER~=0
+	return c:GetOriginalType()&TYPE_MONSTER~=0 and c:IsFaceup()
 end
 function c71401008.filterc2(c,tp)
 	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToRemoveAsCost()

expansions/script/c71401009.lua

@@ -43,7 +43,7 @@ function c71401009.initial_effect(c)
 	yume.ButterflyCounter()
 end
 function c71401009.atkfilter(c)
-	return c:GetOriginalType()&TYPE_MONSTER~=0
+	return c:GetOriginalType()&TYPE_MONSTER~=0 and c:IsFaceup()
 end
 function c71401009.atkval(e,c)
 	return Duel.GetMatchingGroupCount(c71401009.atkfilter,0,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)*200

expansions/script/c71401010.lua

@@ -74,22 +74,19 @@ end
 function c71401010.filterc3(c)
 	return c:IsAbleToRemoveAsCost() and c:IsRace(RACE_SPELLCASTER)
 end
-function c71401010.fselect(g,tp)
-	return aux.dabcheck(g) and Duel.IsExistingMatchingCard(c71401010.filter3,tp,LOCATION_HAND,0,1,g,tp)
-end
 function c71401010.filter3(c,tp)
 	return c:IsType(TYPE_MONSTER) and not c:IsForbidden() and c:CheckUniqueOnField(tp,LOCATION_ONFIELD,nil)
 end
 function c71401010.cost3(e,tp,eg,ep,ev,re,r,rp,chk)
 	local g=Duel.GetMatchingGroup(c71401010.filterc3,tp,LOCATION_HAND,0,nil)
-	if chk==0 then return Duel.GetCustomActivityCount(71401001,tp,ACTIVITY_CHAIN)==0 and g:CheckSubGroup(c71401010.fselect,2,2,tp) end
+	if chk==0 then return Duel.GetCustomActivityCount(71401001,tp,ACTIVITY_CHAIN)==0 and g:CheckSubGroup(aux.dabcheck,2,2) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	local sg=g:SelectSubGroup(tp,c71401010.fselect,false,2,2,tp)
+	local sg=g:SelectSubGroup(tp,aux.dabcheck,false,2,2)
 	Duel.Remove(sg,POS_FACEUP,REASON_COST)
 	yume.RegButterflyCostLimit(e,tp)
 end
 function c71401010.tg3(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0 end
+	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0 and Duel.IsExistingMatchingCard(c71401010.filter3,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil,tp) end
 	if e:GetHandler():IsLocation(LOCATION_GRAVE) then
 		e:SetCategory(CATEGORY_GRAVE_SPSUMMON+CATEGORY_SPECIAL_SUMMON)
 	else
@@ -99,7 +96,7 @@ end
 function c71401010.op3(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
-	local tc=Duel.SelectMatchingCard(tp,c71401010.filter3,tp,LOCATION_HAND,0,1,1,nil,tp):GetFirst()
+	local tc=Duel.SelectMatchingCard(tp,c71401010.filter3,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil,tp):GetFirst()
 	if tc then
 		local c=e:GetHandler()
 		local ctype=Duel.SelectOption(tp,aux.Stringid(71401010,2),aux.Stringid(71401010,3))==0 and TYPE_SPELL or TYPE_TRAP

expansions/script/c71401013.lua

@@ -12,10 +12,10 @@ function c71401013.initial_effect(c)
 	e1:SetTarget(yume.ButterflyPlaceTg)
 	e1:SetOperation(yume.ButterflyTrapOp)
 	c:RegisterEffect(e1)
-	--atk down
+	--atk and def change
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(71401013,0))
-	e2:SetCategory(CATEGORY_REMOVE)
+	e2:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE+CATEGORY_REMOVE)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetCode(EVENT_FREE_CHAIN)
@@ -55,10 +55,13 @@ function c71401013.op2(e,tp,eg,ep,ev,re,r,rp)
 		for sc in aux.Next(g) do
 			local e1=Effect.CreateEffect(c)
 			e1:SetType(EFFECT_TYPE_SINGLE)
-			e1:SetCode(EFFECT_UPDATE_ATTACK)
+			e1:SetCode(EFFECT_SET_ATTACK_FINAL)
 			e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
-			e1:SetValue(-2000)
+			e1:SetValue(0)
 			sc:RegisterEffect(e1)
+			local e2=e1:Clone()
+			e2:SetCode(EFFECT_SET_DEFENSE_FINAL)
+			sc:RegisterEffect(e2)
 		end
 		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

expansions/script/c71401014.lua

@@ -44,16 +44,15 @@ function c71401014.mfilter(c)
 	return c:IsRace(RACE_SPELLCASTER) and c:IsRank(4)
 end
 function c71401014.chainop(e,tp,eg,ep,ev,re,r,rp)
-	if re:GetHandler():GetOriginalType()&TYPE_MONSTER~=0 and re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:GetActivateLocation()==LOCATION_SZONE then
+	if re:GetHandler():GetOriginalType()&TYPE_MONSTER~=0 and re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:GetActivateLocation()==LOCATION_SZONE and c:IsFaceup() then
 		Duel.SetChainLimit(c71401014.chainlm)
 	end
 end
-function c71401014.chainlm(e,rp,tp)
-	local c=e:GetHandler()
-	return tp==rp or c:GetOriginalType()&TYPE_MONSTER==0 and c:IsLocation(LOCATION_ONFIELD)
+function c71401014.chainlm(re,rp,tp)
+	return tp==rp or not re:GetHandler():IsType(TYPE_MONSTER)
 end
 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)
+	return c:GetOriginalType()&TYPE_MONSTER~=0 and c:IsFaceup() 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)
@@ -86,7 +85,7 @@ 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:IsFaceup() or c:IsLocation(LOCATION_MZONE)) and c:IsAbleToRemove(tp,POS_FACEDOWN)
+	return c:GetOriginalType()&TYPE_MONSTER~=0 and c:IsFaceup() 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)

expansions/script/c71401015.lua

@@ -43,8 +43,11 @@ function c71401015.initial_effect(c)
 	c:RegisterEffect(e3)
 	yume.ButterflyCounter()
 end
+function c71401015.filter1(c)
+	return c:IsType(TYPE_SPELL+TYPE_TRAP)
+end
 function c71401015.aclimit(e,re,rp)
-	return re:IsActiveType(TYPE_SPELL+TYPE_TRAP) and Duel.GetFieldGroupCount(rp,LOCATION_ONFIELD,0)==0
+	return re:IsActiveType(TYPE_SPELL+TYPE_TRAP) and not Duel.IsExistingMatchingCard(c71401015.filter1,rp,LOCATION_ONFIELD,0,1,nil)
 end
 function c71401015.filter2c(c)
 	return c:IsLevel(4) and c:IsAbleToRemoveAsCost()
@@ -91,7 +94,7 @@ function c71401015.filter3(c)
 	return c:IsFaceup() and c:IsRace(RACE_SPELLCASTER) and c:IsType(TYPE_XYZ) and Duel.IsExistingMatchingCard(c71401015.filter3a,tp,LOCATION_ONFIELD,0,1,c)
 end
 function c71401015.filter3a(c)
-	return (c:IsFaceup() or c:IsLocation(LOCATION_MZONE)) and c:GetOriginalType()&TYPE_MONSTER~=0 and c:IsCanOverlay()
+	return c:IsFaceup() and c:GetOriginalType()&TYPE_MONSTER~=0 and c:IsCanOverlay()
 end
 function c71401015.tg3(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c71401015.filter3(chkc) end