vme50

expansions/script/c10970014.lua

@@ -83,7 +83,7 @@ function c10970014.cfilter(c,tp)
 	return c:IsControler(1-tp) and c:IsPreviousLocation(LOCATION_DECK) 
 end
 function c10970014.drcon1(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c10970014.cfilter,1,nil,tp) and Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)>Duel.GetFieldGroupCount(tp,LOCATION_HAND,0) and not Duel.IsChainSolving()
+	return eg:IsExists(c10970014.cfilter,1,nil,tp) and Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)>Duel.GetFieldGroupCount(tp,LOCATION_HAND,0) and Duel.IsExistingMatchingCard(c10970014.confilter,tp,LOCATION_MZONE,0,1,nil) and not Duel.IsChainSolving()
 end
 function c10970014.drop1(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_CARD,0,10970014)
@@ -96,7 +96,7 @@ function c10970014.regop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterFlagEffect(tp,10970014,RESET_CHAIN,0,1)
 end
 function c10970014.drcon2(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetFlagEffect(tp,10970014)>0
+	return Duel.GetFlagEffect(tp,10970014)>0 and Duel.IsExistingMatchingCard(c10970014.confilter,tp,LOCATION_MZONE,0,1,nil)
 end
 function c10970014.drop2(e,tp,eg,ep,ev,re,r,rp)
 	local ct=Duel.GetFlagEffect(tp,10970014)
@@ -105,13 +105,13 @@ function c10970014.drop2(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Draw(tp,ct,REASON_EFFECT)
 end
 function c10970014.condition0(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsPlayerAffectedByEffect(tp,10970008) and eg:IsExists(c10970014.cfilter,1,nil,tp) and Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)>Duel.GetFieldGroupCount(tp,LOCATION_HAND,0) and not Duel.IsChainSolving()
+	return Duel.IsPlayerAffectedByEffect(tp,10970008) and eg:IsExists(c10970014.cfilter,1,nil,tp) and Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)>Duel.GetFieldGroupCount(tp,LOCATION_HAND,0) and Duel.IsExistingMatchingCard(c10970014.confilter,tp,LOCATION_MZONE,0,1,nil) and not Duel.IsChainSolving()
 end
 function c10970014.condition1(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsPlayerAffectedByEffect(tp,10970008) and eg:IsExists(c10970014.cfilter,1,nil,tp) and Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)>Duel.GetFieldGroupCount(tp,LOCATION_HAND,0) and Duel.IsChainSolving()
+	return Duel.IsPlayerAffectedByEffect(tp,10970008) and eg:IsExists(c10970014.cfilter,1,nil,tp) and Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)>Duel.GetFieldGroupCount(tp,LOCATION_HAND,0) and Duel.IsExistingMatchingCard(c10970014.confilter,tp,LOCATION_MZONE,0,1,nil) and Duel.IsChainSolving()
 end
 function c10970014.condition2(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsPlayerAffectedByEffect(tp,10970008) and Duel.GetFlagEffect(tp,10970014)>0
+	return Duel.IsPlayerAffectedByEffect(tp,10970008) and Duel.IsExistingMatchingCard(c10970014.confilter,tp,LOCATION_MZONE,0,1,nil) and Duel.GetFlagEffect(tp,10970014)>0
 end
 function c10970014.confilter(c)
 	return c:IsFaceup() and c:IsSetCard(0x1233)
@@ -137,4 +137,4 @@ function c10970014.repop(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		Duel.SendtoGrave(g,REASON_EFFECT)
 	end
-end
+end
\ No newline at end of file