ndyd

expansions/script/c20000102.lua

@@ -31,12 +31,14 @@ function c20000102.co1(e,tp,eg,ep,ev,re,r,rp,chk)
 	return true
 end
 function c20000102.cof1(c,e,tp)
-	return c:IsSetCard(0x9fd1) and Duel.GetMZoneCount(tp,c)>0
+	return c:IsSetCard(0x9fd1)
 		and Duel.IsExistingMatchingCard(c20000102.cof12,tp,LOCATION_EXTRA+LOCATION_HAND,0,1,nil,e,tp,c:GetAttribute(),c)
 end
 function c20000102.cof12(c,e,tp,att,mc)
 	return c:IsSetCard(0x6fd1) and c:IsCanBeSpecialSummoned(e,0,tp,true,false) and c:GetAttribute()==att
-	and Duel.GetLocationCountFromEx(tp,tp,mc,c)>0 and (c:IsLevel(8) or c:IsRank(8))
+	and ((c:IsPreviousLocation(LOCATION_EXTRA) and Duel.GetLocationCountFromEx(tp,tp,mc,c)>0)
+	or (c:IsPreviousLocation(LOCATION_HAND) and Duel.GetMZoneCount(tp,c)>0))
+	and (c:IsLevel(8) or c:IsRank(8))
 end
 function c20000102.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then