eme

expansions/script/c33200501.lua

@@ -108,6 +108,9 @@ function c33200501.tzop(e,tp,eg,ep,ev,re,r,rp)
 				Duel.Draw(tp,dtm,REASON_EFFECT)
 				for drc in aux.Next(co) do
 					drc:RegisterFlagEffect(33200508,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
+					if drc:GetFlagEffect(33200508)>=2 then 
+						drc:ResetFlagEffect(33200507)
+					end
 				end
 			end
 			if Duel.IsExistingMatchingCard(c33200501.rmfilter,tp,0,LOCATION_ONFIELD,1,nil,opt) and Duel.SelectYesNo(tp,aux.Stringid(33200501,2)) then 
@@ -132,6 +135,9 @@ function c33200501.tzop(e,tp,eg,ep,ev,re,r,rp)
 				Duel.Draw(tp,dtm,REASON_EFFECT)
 				for drc in aux.Next(co) do
 					drc:RegisterFlagEffect(33200508,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
+					if drc:GetFlagEffect(33200508)>=2 then 
+						drc:ResetFlagEffect(33200507)
+					end
 				end
 			end
 			if Duel.IsExistingMatchingCard(c33200501.rmfilter,tp,0,LOCATION_ONFIELD,1,nil,opt) and Duel.SelectYesNo(tp,aux.Stringid(33200501,2)) then 

expansions/script/c33200507.lua

@@ -60,6 +60,9 @@ function c33200507.tzop(e,tp,eg,ep,ev,re,r,rp)
 				Duel.Draw(tp,dtm,REASON_EFFECT)
 				for drc in aux.Next(co) do
 					drc:RegisterFlagEffect(33200508,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
+					if drc:GetFlagEffect(33200508)>=2 then 
+						drc:ResetFlagEffect(33200507)
+					end
 				end
 			end
 		end
@@ -94,6 +97,9 @@ function c33200507.tzop(e,tp,eg,ep,ev,re,r,rp)
 				Duel.Draw(tp,dtm,REASON_EFFECT)
 				for drc in aux.Next(co) do
 					drc:RegisterFlagEffect(33200508,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
+					if drc:GetFlagEffect(33200508)>=2 then 
+						drc:ResetFlagEffect(33200507)
+					end
 				end
 			end
 		end

expansions/script/c33200516.lua

@@ -114,11 +114,9 @@ function c33200516.tzop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.ShuffleHand(1-tp)
 		local opt=e:GetLabel()
 		if (opt==0 and sgc:IsType(TYPE_MONSTER)) or (opt==1 and sgc:IsType(TYPE_SPELL)) or (opt==2 and sgc:IsType(TYPE_TRAP)) then
-			local op=nil
+			local op=0
 			if c:IsRelateToEffect(e) then 
 				op=Duel.SelectOption(1-tp,aux.Stringid(33200516,2),aux.Stringid(33200516,3))
-			else
-				op=0
 			end 
 			if op==0 then 
 				Duel.SendtoGrave(sgc,REASON_EFFECT)
@@ -132,6 +130,9 @@ function c33200516.tzop(e,tp,eg,ep,ev,re,r,rp)
 					Duel.Draw(tp,dtm,REASON_EFFECT)
 					for drc in aux.Next(co) do
 						drc:RegisterFlagEffect(33200508,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
+						if drc:GetFlagEffect(33200508)>=2 then 
+							drc:ResetFlagEffect(33200507)
+						end
 					end
 				end
 				Duel.Destroy(c,REASON_EFFECT)
@@ -144,7 +145,10 @@ function c33200516.tzop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.ShuffleHand(1-tp)
 		local opt=e:GetLabel()
 		if (opt==0 and sgc:IsType(TYPE_MONSTER)) or (opt==1 and sgc:IsType(TYPE_SPELL)) or (opt==2 and sgc:IsType(TYPE_TRAP)) then
-			op=Duel.SelectOption(1-tp,aux.Stringid(33200516,2),aux.Stringid(33200516,3))
+			local op=0
+			if c:IsRelateToEffect(e) then 
+				op=Duel.SelectOption(1-tp,aux.Stringid(33200516,2),aux.Stringid(33200516,3))
+			end 
 			if op==0 then 
 				Duel.SendtoGrave(sgc,REASON_EFFECT)
 			else
@@ -157,6 +161,9 @@ function c33200516.tzop(e,tp,eg,ep,ev,re,r,rp)
 					Duel.Draw(tp,dtm,REASON_EFFECT)
 					for drc in aux.Next(co) do
 						drc:RegisterFlagEffect(33200508,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
+						if drc:GetFlagEffect(33200508)>=2 then 
+							drc:ResetFlagEffect(33200507)
+						end
 					end
 				end
 				Duel.Destroy(c,REASON_EFFECT)