ybb

expansions/script/c17061260.lua

@@ -36,7 +36,7 @@ function cm.splimit(e,se,sp,st)
 	return se:IsHasType(EFFECT_TYPE_ACTIONS) or bit.band(st,SUMMON_TYPE_PENDULUM)==SUMMON_TYPE_PENDULUM
 end
 function cm.ovcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():IsSummonLocation(LOCATION_EXTRA)
+	return e:GetHandler():IsSummonLocation(LOCATION_GRAVE)
 end
 function cm.ovtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,0,LOCATION_HAND+LOCATION_ONFIELD+LOCATION_GRAVE,1,nil) end

expansions/script/c64800042.lua

@@ -41,7 +41,10 @@ function cm.splimit(e,se,sp,st)
 	return se:IsHasType(EFFECT_TYPE_ACTIONS)
 end
 function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return ep==tp and Duel.GetFieldGroupCount(tp,LOCATION_SZONE,0)==0 and Duel.GetMatchingGroupCount(nil,tp,LOCATION_MZONE,0,nil)==0
+	return ep==tp and not Duel.IsExistingMatchingCard(cm.cfilter,1-tp,0,LOCATION_SZONE,1,nil) and Duel.GetMatchingGroupCount(nil,tp,LOCATION_MZONE,0,nil)==0
+end
+function cm.cfilter(c)
+	return c:GetSequence()<5
 end
 function cm.filter(c,tp,rp)
 	return c:IsPreviousLocation(LOCATION_MZONE) and c:GetPreviousControler()==tp  and (c:IsReason(REASON_BATTLE) or (rp==1-tp and c:IsReason(REASON_EFFECT)))