update Summon Witch

c61665245.lua

@@ -54,8 +54,13 @@ function c61665245.spfilter2(c,e,tp,lg)
 	return c:IsFaceup() and lg:IsContains(c) and Duel.IsExistingMatchingCard(c61665245.spfilter3,tp,LOCATION_DECK,0,1,nil,e,tp,c:GetRace())
 end
 function c61665245.spfilter3(c,e,tp,rac)
-	return c:IsRace(rac)
-		and (c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE) or c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE,1-tp))
+	if not c:IsRace(rac) then return false end
+	local ok=false
+	for p=0,1 do
+		local zone=e:GetHandler():GetLinkedZone(p)&0xff
+		ok=ok or (Duel.GetLocationCount(p,LOCATION_MZONE,tp,LOCATION_REASON_TOFIELD,zone)>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE,p,zone))
+	end
+	return ok
 end
 function c61665245.sptg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local c=e:GetHandler()
@@ -64,9 +69,7 @@ function c61665245.sptg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	zone[1]=c:GetLinkedZone(1)
 	local lg=c:GetLinkedGroup()
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c61665245.spfilter2(chkc,e,tp,lg) end
-	if chk==0 then return (Duel.GetLocationCount(tp,LOCATION_MZONE,tp,LOCATION_REASON_TOFIELD,zone[tp])>0
-		or Duel.GetLocationCount(1-tp,LOCATION_MZONE,tp,LOCATION_REASON_TOFIELD,zone[1-tp])>0)
-		and Duel.IsExistingTarget(c61665245.spfilter2,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,e,tp,lg) end
+	if chk==0 then return Duel.IsExistingTarget(c61665245.spfilter2,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,e,tp,lg) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
 	Duel.SelectTarget(tp,c61665245.spfilter2,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil,e,tp,lg)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
@@ -76,30 +79,24 @@ function c61665245.spop2(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if not c:IsRelateToEffect(e) or not tc:IsRelateToEffect(e) or tc:IsFacedown() then return end
 	local zone={}
-	local ft={}
-	flag={}
+	local flag={}
 	for p=0,1 do
-		zone[p]=c:GetLinkedZone(p)
-		ft[p],flag[p]=Duel.GetLocationCount(p,LOCATION_MZONE,p,LOCATION_REASON_TOFIELD,zone[p])
-		flag[p]=(~flag[p])&0x7f
+		zone[p]=c:GetLinkedZone(p)&0xff
+		local _,flag_tmp=Duel.GetLocationCount(p,LOCATION_MZONE,tp,LOCATION_REASON_TOFIELD,zone[p])
+		flag[p]=(~flag_tmp)&0x7f
 	end
-	if ft[0]<=0 and ft[1]<=0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g=Duel.SelectMatchingCard(tp,c61665245.spfilter3,tp,LOCATION_DECK,0,1,1,nil,e,tp,tc:GetRace())
-	local tc=g:GetFirst()
-	if tc then
+	local sc=g:GetFirst()
+	if sc then
 		local ava_zone=0
-		local ava_zone_rev=0x00ff00ff
-		if tc:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE,tp,zone[tp]) then
-			ava_zone=ava_zone|flag[tp]
-			ava_zone_rev=ava_zone_rev&(~flag[tp])
-		end
-		if tc:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE,1-tp,zone[1-tp]) then
-			ava_zone=ava_zone|(flag[1-tp]<<16)
-			ava_zone_rev=ava_zone_rev&(~(flag[1-tp]<<16))
+		for p=0,1 do
+			if sc:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE,p,zone[p]) then
+				ava_zone=ava_zone|(flag[p]<<(p==tp and 0 or 16))
+			end
 		end
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOZONE)
-		local sel_zone=Duel.SelectDisableField(tp,1,LOCATION_MZONE,LOCATION_MZONE,ava_zone_rev)
+		local sel_zone=Duel.SelectDisableField(tp,1,LOCATION_MZONE,LOCATION_MZONE,0x00ff00ff&(~ava_zone))
 		local sump=0
 		if sel_zone&0xff>0 then
 			sump=tp
@@ -107,17 +104,17 @@ function c61665245.spop2(e,tp,eg,ep,ev,re,r,rp)
 			sump=1-tp
 			sel_zone=sel_zone>>16
 		end
-		if Duel.SpecialSummonStep(tc,0,tp,sump,false,false,POS_FACEUP_DEFENSE,sel_zone) then
+		if Duel.SpecialSummonStep(sc,0,tp,sump,false,false,POS_FACEUP_DEFENSE,sel_zone) then
 			local e1=Effect.CreateEffect(c)
 			e1:SetType(EFFECT_TYPE_SINGLE)
 			e1:SetCode(EFFECT_DISABLE)
 			e1:SetReset(RESET_EVENT+RESETS_STANDARD)
-			tc:RegisterEffect(e1)
+			sc:RegisterEffect(e1)
 			local e2=Effect.CreateEffect(c)
 			e2:SetType(EFFECT_TYPE_SINGLE)
 			e2:SetCode(EFFECT_DISABLE_EFFECT)
 			e2:SetReset(RESET_EVENT+RESETS_STANDARD)
-			tc:RegisterEffect(e2)
+			sc:RegisterEffect(e2)
 			Duel.SpecialSummonComplete()
 		end
 	end