simplify #785 and #788

c21377582.lua

@@ -88,6 +88,7 @@ function c21377582.regcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function c21377582.regop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
+	local typ=e:GetLabelObject():GetLabel()
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
@@ -95,9 +96,8 @@ function c21377582.regop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetReset(RESET_EVENT+0x1fe0000)
 	e1:SetValue(c21377582.efilter)
-	e1:SetLabelObject(e:GetLabelObject())
+	e1:SetLabel(typ)
 	c:RegisterEffect(e1)
-	local typ=e:GetLabelObject():GetLabel()
 	if bit.band(typ,TYPE_MONSTER)~=0 then
 		c:RegisterFlagEffect(0,RESET_EVENT+0x1fe0000,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(21377582,3))
 	end
@@ -109,7 +109,7 @@ function c21377582.regop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c21377582.efilter(e,te)
-	return te:IsActiveType(e:GetLabelObject():GetLabel()) and te:GetOwner()~=e:GetOwner()
+	return te:IsActiveType(e:GetLabel()) and te:GetOwner()~=e:GetOwner()
 end
 function c21377582.descon(e,tp,eg,ep,ev,re,r,rp)
 	return bit.band(e:GetHandler():GetSummonType(),SUMMON_TYPE_ADVANCE)==SUMMON_TYPE_ADVANCE

c30539496.lua

@@ -74,10 +74,8 @@ function c30539496.spop(e,tp,eg,ep,ev,re,r,rp)
 			if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0
 				and c:IsCanBeSpecialSummoned(e,0,tp,false,false) then
 				Duel.SendtoGrave(c,REASON_RULE)
-				return
-			else
-				return
 			end
+			return
 		end
 		local rg=Duel.GetMatchingGroup(Card.IsAbleToRemove,tp,0,LOCATION_EXTRA,nil)
 		if rm and rg:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(30539496,2)) then

c57761191.lua

@@ -92,6 +92,7 @@ function c57761191.regcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function c57761191.regop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
+	local typ=e:GetLabelObject():GetLabel()
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
@@ -99,9 +100,8 @@ function c57761191.regop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetReset(RESET_EVENT+0x1fe0000)
 	e1:SetValue(c57761191.efilter)
-	e1:SetLabelObject(e:GetLabelObject())
+	e1:SetLabel(typ)
 	c:RegisterEffect(e1)
-	local typ=e:GetLabelObject():GetLabel()
 	if bit.band(typ,TYPE_MONSTER)~=0 then
 		c:RegisterFlagEffect(0,RESET_EVENT+0x1fe0000,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(57761191,2))
 	end
@@ -113,7 +113,7 @@ function c57761191.regop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c57761191.efilter(e,te)
-	return te:IsActiveType(e:GetLabelObject():GetLabel()) and te:GetOwner()~=e:GetOwner()
+	return te:IsActiveType(e:GetLabel()) and te:GetOwner()~=e:GetOwner()
 end
 function c57761191.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

c82321037.lua

@@ -75,10 +75,8 @@ function c82321037.spop(e,tp,eg,ep,ev,re,r,rp)
 			if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0
 				and c:IsCanBeSpecialSummoned(e,0,tp,false,false) then
 				Duel.SendtoGrave(c,REASON_RULE)
-				return
-			else
-				return
 			end
+			return
 		end
 		local rg=Duel.GetMatchingGroup(c82321037.rmfilter,tp,0,LOCATION_ONFIELD+LOCATION_GRAVE,nil)
 		if rm and rg:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(82321037,0)) then

c94160895.lua

@@ -74,10 +74,8 @@ function c94160895.spop(e,tp,eg,ep,ev,re,r,rp)
 			if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0
 				and c:IsCanBeSpecialSummoned(e,0,tp,false,false) then
 				Duel.SendtoGrave(c,REASON_RULE)
-				return
-			else
-				return
 			end
+			return
 		end
 		local rg=Duel.GetDecktopGroup(1-tp,4)
 		if rm and rg:GetCount()>0 and rg:FilterCount(Card.IsAbleToRemove,nil)==4

c96746083.lua

@@ -75,10 +75,8 @@ function c96746083.spop(e,tp,eg,ep,ev,re,r,rp)
 			if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0
 				and c:IsCanBeSpecialSummoned(e,0,tp,false,false) then
 				Duel.SendtoGrave(c,REASON_RULE)
-				return
-			else
-				return
 			end
+			return
 		end
 		local rg=Duel.GetMatchingGroup(c96746083.rmfilter,tp,0,LOCATION_MZONE+LOCATION_GRAVE,nil,tp)
 		if rm and rg:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(96746083,0)) then