Merge pull request #1404 from DailyShana/patch-5

fix

script/c1248895.lua

@@ -32,13 +32,8 @@ function c1248895.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 end
 function c1248895.activate(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
-	local dg=nil
 	local tpe=tc:GetType()
 	if bit.band(tpe,TYPE_TOKEN)~=0 then return end
-	if bit.band(tpe,0x802040)~=0 then
-		dg=Duel.GetMatchingGroup(Card.IsCode,tc:GetControler(),LOCATION_EXTRA,0,nil,tc:GetCode())
-	else
-		dg=Duel.GetMatchingGroup(Card.IsCode,tc:GetControler(),LOCATION_DECK+LOCATION_HAND,0,nil,tc:GetCode())
-	end
+	local dg=Duel.GetMatchingGroup(Card.IsCode,tc:GetControler(),LOCATION_DECK+LOCATION_HAND,0,nil,tc:GetCode())
 	Duel.Destroy(dg,REASON_EFFECT)
 end

script/c57139487.lua

@@ -35,14 +35,9 @@ function c57139487.activate(e,tp,eg,ep,ev,re,r,rp)
 	local tc=sg:GetFirst()
 	while tc do
 		if tc:IsLocation(LOCATION_REMOVED) then
-			local g1=nil
 			local tpe=tc:GetType()
-			if bit.band(tpe,0x802040)~=0 then
-				g1=Duel.GetMatchingGroup(Card.IsCode,tp,0,LOCATION_EXTRA,nil,tc:GetCode())
-				rg:Merge(g1)
-			elseif bit.band(tpe,TYPE_TOKEN)~=0 then
-			else
-				g1=Duel.GetMatchingGroup(Card.IsCode,tp,0,LOCATION_DECK+LOCATION_HAND,nil,tc:GetCode())
+			if bit.band(tpe,TYPE_TOKEN)==0 then
+				local g1=Duel.GetMatchingGroup(Card.IsCode,tp,0,LOCATION_DECK+LOCATION_HAND,nil,tc:GetCode())
 				rg:Merge(g1)
 			end
 		end