fix

expansions/script/c11451638.lua

@@ -115,7 +115,7 @@ function cm.rsop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.filter(c,tp)
-	return c:IsCode(11451631) and not c:IsForbidden() and c:CheckUniqueOnField(tp) and (c:IsType(TYPE_FIELD) or Duel.GetLocationCount(tp,LOCATION_SZONE)>0 or (Duel.IsPlayerAffectedByEffect(tp,11451676) and Duel.GetLocationCount(1-tp,LOCATION_SZONE)>0)) and c:GetActivateEffect():IsActivatable(tp,true,true)
+	return c:IsCode(11451631) and not c:IsForbidden() and c:CheckUniqueOnField(tp) and (c:IsType(TYPE_FIELD) or Duel.GetLocationCount(tp,LOCATION_SZONE)>0 or Duel.IsPlayerAffectedByEffect(tp,11451676)) and c:GetActivateEffect():IsActivatable(tp,true,true)
 end
 function cm.filter0(c)
 	return c:IsCanBeFusionMaterial() --and (not c:IsLocation(LOCATION_REMOVED) or c:IsFaceup())
@@ -223,7 +223,20 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 			end
 			Duel.SendtoGrave(mat2,REASON_EFFECT+REASON_MATERIAL+REASON_FUSION+REASON_RETURN)
 			Duel.BreakEffect()
-			Duel.SpecialSummon(tc,SUMMON_TYPE_FUSION,tp,tp,false,false,POS_FACEUP)
+			local le={Duel.IsPlayerAffectedByEffect(tp,EFFECT_CANNOT_SPECIAL_SUMMON)}
+			local lex={Duel.IsPlayerAffectedByEffect(tp,EFFECT_LIMIT_SPECIAL_SUMMON_POSITION)}
+			for _,v in pairs(lex) do table.insert(le,v) end
+			local ret1,ret2={},{}
+			for _,v in pairs(le) do
+				local tg=v:GetTarget()
+				if not tg then tg=aux.TRUE end
+				table.insert(ret1,v)
+				table.insert(ret2,tg)
+				v:SetTarget(cm.chtg(tg,e))
+			end
+			Duel.SpecialSummonStep(tc,SUMMON_TYPE_FUSION,tp,tp,false,false,POS_FACEUP)
+			for i=1,#ret1 do ret1[i]:SetTarget(ret2[i]) end
+			Duel.SpecialSummonComplete()
 		else
 			local mat2=Duel.SelectFusionMaterial(tp,tc,mg3,nil,chkf)
 			local fop=ce:GetOperation()
@@ -232,6 +245,12 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 		tc:CompleteProcedure()
 	end
 end
+function cm.chtg(_tg,re)
+	return function(e,c,sump,sumtype,sumpos,targetp,se)
+			   if se==re then return false end
+			   return _tg(e,c,sump,sumtype,sumpos,targetp,se)
+		   end
+end
 function cm.actfilter(c,se)
 	if not (se==nil or c:GetReasonEffect()~=se) then return false end
 	local code1,code2=c:GetPreviousCodeOnField()
@@ -264,6 +283,22 @@ end
 function cm.destg2(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(aux.NecroValleyFilter(cm.filter),tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil,tp) end
 end
+function cm.GetCardsInZone(tp,fd)
+	if fd==0x400020 then return Duel.GetFieldCard(tp,LOCATION_MZONE,5) or Duel.GetFieldCard(1-tp,LOCATION_MZONE,6) end
+	if fd==0x200040 then return Duel.GetFieldCard(tp,LOCATION_MZONE,6) or Duel.GetFieldCard(1-tp,LOCATION_MZONE,5) end
+	local seq=math.log(fd,2)
+	local p=tp
+	if seq>=16 then
+		p=1-tp
+		seq=seq-16
+	end
+	local loc=LOCATION_MZONE
+	if seq>=8 then
+		loc=LOCATION_SZONE
+		seq=seq-8
+	end
+	return Duel.GetFieldCard(p,loc,math.floor(seq+0.5))
+end
 function cm.desop2(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
 	local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(cm.filter),tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil,tp)
@@ -283,8 +318,12 @@ function cm.desop2(e,tp,eg,ep,ev,re,r,rp)
 			if tc:IsType(TYPE_FIELD) then
 				local fc=Duel.GetFieldCard(sp,LOCATION_FZONE,0)
 				if fc then
-					Duel.SendtoGrave(fc,REASON_RULE)
-					Duel.BreakEffect()
+					if Duel.IsPlayerAffectedByEffect(tp,11451676) then
+						Duel.Destroy(fc,REASON_RULE)
+					else
+						Duel.SendtoGrave(fc,REASON_RULE)
+						Duel.BreakEffect()
+					end
 				end
 				Duel.MoveToField(tc,tp,sp,LOCATION_FZONE,POS_FACEUP,true)
 				local te=tc:GetActivateEffect()
@@ -293,7 +332,20 @@ function cm.desop2(e,tp,eg,ep,ev,re,r,rp)
 				if cost then cost(te,tep,eg,ep,ev,re,r,rp,1) end
 				Duel.RaiseEvent(tc,4179255,te,0,tp,tp,Duel.GetCurrentChain())
 			else
-				Duel.MoveToField(tc,tp,sp,LOCATION_SZONE,POS_FACEUP,true)
+				Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(11451675,0))
+				local fd=0xff
+				if Duel.IsPlayerAffectedByEffect(tp,11451676) then
+					if sp==tp then
+						fd=Duel.SelectField(tp,1,LOCATION_SZONE,0,0x20002000)
+					else
+						fd=Duel.SelectField(tp,1,0,LOCATION_SZONE,0x20002000)
+					end
+					local fc=cm.GetCardsInZone(tp,fd)
+					if fc then Duel.Destroy(fc,REASON_RULE) end
+					fd=fd>>8
+					if sp~=tp then fd=fd>>16 end
+				end
+				Duel.MoveToField(tc,tp,sp,LOCATION_SZONE,POS_FACEUP,true,fd)
 				local te=tc:GetActivateEffect()
 				local tep=tc:GetControler()
 				local cost=te:GetCost()
@@ -302,67 +354,30 @@ function cm.desop2(e,tp,eg,ep,ev,re,r,rp)
 		else
 			if tc:IsType(TYPE_FIELD) then
 				local fc=Duel.GetFieldCard(sp,LOCATION_FZONE,0)
-				if fc then
-					Duel.SendtoGrave(fc,REASON_RULE)
-					Duel.BreakEffect()
+				if fc and Duel.IsPlayerAffectedByEffect(tp,11451676) then
+					Duel.Destroy(fc,REASON_RULE)
 				end
 				Duel.SSet(tp,tc,sp)
 			else
-				Duel.SSet(tp,tc,sp)
-			end
-		end
-	end
-end
-function cm.desop2(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_OPERATECARD)
-	local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(cm.filter),tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil,tp)
-	local tc=g:GetFirst()
-	if tc then
-		local sp=1-tp
-		if not Duel.IsPlayerAffectedByEffect(tp,11451676) or (not tc:IsType(TYPE_FIELD) and Duel.GetLocationCount(1-tp,LOCATION_SZONE)<=0) or ((tc:IsType(TYPE_FIELD) or Duel.GetLocationCount(tp,LOCATION_SZONE)>0) and Duel.SelectOption(tp,aux.Stringid(11451631,3),aux.Stringid(11451631,4))==0) then sp=tp end
-		if tc:IsType(TYPE_FIELD) then
-			local fc=Duel.GetFieldCard(sp,LOCATION_FZONE,0)
-			if fc then
-				Duel.SendtoGrave(fc,REASON_RULE)
-				Duel.BreakEffect()
+				Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(11451675,0))
+				local fd=0xff
+				if Duel.IsPlayerAffectedByEffect(tp,11451676) then
+					if sp==tp then
+						fd=Duel.SelectField(tp,1,LOCATION_SZONE,0,0x20002000)
+					else
+						fd=Duel.SelectField(tp,1,0,LOCATION_SZONE,0x20002000)
+					end
+					local fc=cm.GetCardsInZone(tp,fd)
+					if fc then Duel.Destroy(fc,REASON_RULE) end
+					fd=fd>>8
+					if sp~=tp then fd=fd>>16 end
+				end
+				Duel.MoveToField(tc,tp,sp,LOCATION_SZONE,POS_FACEDOWN,false,fd)
+				Duel.ConfirmCards(1-sp,tc)
+				tc:SetStatus(STATUS_SET_TURN,true)
+				Duel.RaiseEvent(tc,EVENT_SSET,e,REASON_EFFECT,tp,tp,ev)
 			end
-			Duel.MoveToField(tc,tp,sp,LOCATION_FZONE,POS_FACEUP,true)
-			local te=tc:GetActivateEffect()
-			local tep=tc:GetControler()
-			local cost=te:GetCost()
-			if cost then cost(te,tep,eg,ep,ev,re,r,rp,1) end
-			Duel.RaiseEvent(tc,4179255,te,0,tp,tp,Duel.GetCurrentChain())
-		else
-			Duel.MoveToField(tc,tp,sp,LOCATION_SZONE,POS_FACEUP,true)
-			local te=tc:GetActivateEffect()
-			local tep=tc:GetControler()
-			local cost=te:GetCost()
-			if cost then cost(te,tep,eg,ep,ev,re,r,rp,1) end
 		end
-		--[[local te=tc:GetActivateEffect()
-		if te:IsActivatable(tp,true,true) and (not tc:CheckActivateEffect(false,false,false) or Duel.SelectOption(tp,aux.Stringid(11451631,3),aux.Stringid(11451631,4))==0) then
-			local fc=Duel.GetFieldCard(tp,LOCATION_FZONE,0)
-			if fc then
-				Duel.SendtoGrave(fc,REASON_RULE)
-				Duel.BreakEffect()
-			end
-			Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,true)
-			local tep=tc:GetControler()
-			local cost=te:GetCost()
-			if cost then cost(te,tep,eg,ep,ev,re,r,rp,1) end
-			Duel.RaiseEvent(tc,4179255,te,0,tp,tp,Duel.GetCurrentChain())
-		else
-			local fc=Duel.GetFieldCard(1-tp,LOCATION_FZONE,0)
-			if fc then
-				Duel.SendtoGrave(fc,REASON_RULE)
-				Duel.BreakEffect()
-			end
-			Duel.MoveToField(tc,tp,1-tp,LOCATION_FZONE,POS_FACEUP,true)
-			local tep=tc:GetControler()
-			local cost=te:GetCost()
-			if cost then cost(te,tep,eg,ep,ev,re,r,rp,1) end
-			Duel.RaiseEvent(tc,4179255,te,0,tp,tp,Duel.GetCurrentChain())
-		end--]]
 	end
 end
 

expansions/script/c28324124.lua

@@ -10,16 +10,17 @@ function c28324124.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c28324124.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,LOCATION_ONFIELD,0,1,c) end
+	local exc=e:IsHasType(EFFECT_TYPE_ACTIVATE) and e:GetHandler() or nil
+	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,LOCATION_ONFIELD,0,1,exc) end
 	if e:IsHasType(EFFECT_TYPE_ACTIVATE) then
 		Duel.SetChainLimit(aux.FALSE)
 	end
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_ONFIELD)
 end
 function c28324124.activate(e,tp,eg,ep,ev,re,r,rp)
+	local exc=e:IsHasType(EFFECT_TYPE_ACTIVATE) and aux.ExceptThisCard(e) or nil
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	local g=Duel.SelectMatchingCard(tp,Card.IsAbleToRemove,tp,LOCATION_ONFIELD,0,1,1,aux.ExceptThisCard(e))
+	local g=Duel.SelectMatchingCard(tp,Card.IsAbleToRemove,tp,LOCATION_ONFIELD,0,1,1,exc)
 	if g:GetCount()==0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	local gg=Duel.SelectMatchingCard(tp,Card.IsAbleToRemove,tp,LOCATION_GRAVE,0,0,1,nil)

expansions/script/c53797033.lua

@@ -42,11 +42,11 @@ function s.sumop(e,tp,eg,ep,ev,re,r,rp)
 		if v:GetRange()&0x10a~=0 then
 			local e1=v:Clone()
 			e1:SetRange(LOCATION_REMOVED)
-			e1:SetReset(RESET_PHASE+PHASE_END)
+			e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 			tc:RegisterEffect(e1,true)
 			local e2=SNNM.Act(tc,e1)
 			e2:SetRange(LOCATION_REMOVED)
-			e2:SetReset(RESET_PHASE+PHASE_END)
+			e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 			tc:RegisterEffect(e2,true)
 		end
 	end

expansions/script/c9911720.lua

@@ -18,7 +18,7 @@ function c9911720.initial_effect(c)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
 	e2:SetOperation(c9911720.regop)
 	c:RegisterEffect(e2)
-	--destroy
+	--remove
 	local e3=Effect.CreateEffect(c)
 	e3:SetCategory(CATEGORY_REMOVE)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
@@ -26,7 +26,6 @@ function c9911720.initial_effect(c)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e3:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE)
-	e3:SetCountLimit(1)
 	e3:SetCondition(c9911720.rmcon)
 	e3:SetCost(c9911720.rmcost)
 	e3:SetTarget(c9911720.rmtg)