byd

expansions/script/c13700013.lua

@@ -61,9 +61,6 @@ function c13700013.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local tc=Duel.GetOperatedGroup():GetFirst()
 	e:SetLabelObject(tc)
 end
-function c13700013.disfilter(c,race)
-	return aux.NegateMonsterFilter(c) and c:IsRace(race)
-end
 function c13700013.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=e:GetLabelObject()
@@ -101,33 +98,14 @@ function c13700013.operation(e,tp,eg,ep,ev,re,r,rp)
 		e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 		e3:SetValue(tc:GetOriginalRace())
 		c:RegisterEffect(e3)
-		local dg=Duel.GetMatchingGroup(c13700013.disfilter,tp,LOCATION_MZONE,LOCATION_MZONE,c,c:GetRace())
-		local dc=dg:GetFirst()
-		while dc do
-			Duel.NegateRelatedChain(dc,RESET_TURN_SET)
-			local e1=Effect.CreateEffect(c)
-			e1:SetType(EFFECT_TYPE_SINGLE)
-			e1:SetCode(EFFECT_DISABLE)
-			e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-			e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
-			dc:RegisterEffect(e1)
-			local e2=Effect.CreateEffect(c)
-			e2:SetType(EFFECT_TYPE_SINGLE)
-			e2:SetCode(EFFECT_DISABLE_EFFECT)
-			e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-			e2:SetValue(RESET_TURN_SET)
-			e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
-			dc:RegisterEffect(e2)
-			if tc:IsType(TYPE_TRAPMONSTER) then
-				local e3=Effect.CreateEffect(c)
-				e3:SetType(EFFECT_TYPE_SINGLE)
-				e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-				e3:SetCode(EFFECT_DISABLE_TRAPMONSTER)
-				e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
-				tc:RegisterEffect(e3)
-			end
-			dc=dg:GetNext()
-		end
+		--disable
+		local e4=Effect.CreateEffect(c)
+		e4:SetType(EFFECT_TYPE_FIELD)
+		e4:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
+		e4:SetCode(EFFECT_DISABLE)
+		e4:SetTarget(c13700013.disable)
+		e4:SetReset(RESET_PHASE+PHASE_END)
+		Duel.RegisterEffect(e4,tp)
 	end
 end
 function c13700013.rstop(e,tp,eg,ep,ev,re,r,rp)
@@ -141,4 +119,8 @@ function c13700013.rstop(e,tp,eg,ep,ev,re,r,rp)
 	e1:Reset()
 	Duel.HintSelection(Group.FromCards(c))
 	Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
+end
+function c13700013.disable(e,c)
+	return (c:IsType(TYPE_EFFECT) or c:GetOriginalType()&TYPE_EFFECT~=0)
+		and c~=e:GetHandler() and c:IsRace(e:GetHandler():GetRace())
 end
\ No newline at end of file