str

expansions/script/c33501033.lua

@@ -23,7 +23,7 @@ function cm.initial_effect(c)
 end
 function cm.checkop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=re:GetHandler()
-	if tc:IsType(TYPE_MONSTER) then
+	if tc~=e:GetHandler() then
 		Sre_setbackt[1]=tc
 	end
 end
@@ -32,30 +32,29 @@ function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if Sre_setbackt[1]~=0 then
 		res=Sre_setbackt[1]
 	end
-	if chk==0 then return res and res:IsControler(1-tp) and res:IsLocation(LOCATION_ONFIELD) and res:IsControlerCanBeChanged() end
+	if chk==0 then return res and res:IsControler(1-tp) and res:IsLocation(LOCATION_ONFIELD) end
 	Duel.SetOperationInfo(0,CATEGORY_CONTROL,Sre_setbackt[1],1,0,0)
 end
 function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=Sre_setbackt[1]
-	if tc:IsRelateToEffect(e) then
-		if tc:IsLocation(LOCATION_MZONE) then
-			Duel.GetControl(tc,tp)
-		elseif tc:IsLocation(LOCATION_FZONE) then
-			local fc=Duel.GetFieldCard(tp,LOCATION_FZONE,0)
-			if fc then
-				Duel.SendtoGrave(fc,REASON_RULE)
-				Duel.BreakEffect()
-			end
+	if not c:IsLocation(LOCATION_ONFIELD) then return end
+	if tc:IsLocation(LOCATION_MZONE) then
+		Duel.GetControl(tc,tp)
+	elseif tc:IsLocation(LOCATION_FZONE) then
+		local fc=Duel.GetFieldCard(tp,LOCATION_FZONE,0)
+		if fc then
+			Duel.SendtoGrave(fc,REASON_RULE)
+			Duel.BreakEffect()
+		end
+		local pos=tc:GetPosition()
+		Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,pos,true)
+	else
+		if Duel.GetLocationCount(tp,LOCATION_SZONE)>0 then
 			local pos=tc:GetPosition()
-			Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,pos,true)
+			Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,pos,true)
 		else
-			if Duel.GetLocationCount(tp,LOCATION_SZONE)>0 then
-				local pos=tc:GetPosition()
-				Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,pos,true)
-			else
-				Duel.SendtoGrave(tc,REASON_RULE)
-			end
+			Duel.SendtoGrave(tc,REASON_RULE)
 		end
 	end
 	if c:IsRelateToEffect(e) and c:IsCanTurnSet() and e:IsHasType(EFFECT_TYPE_ACTIVATE) then