sjb

expansions/script/c16104410.lua

@@ -195,7 +195,7 @@ function cm.cfilter(c)
 	return c:IsType(TYPE_MONSTER) and c:IsAbleToRemoveAsCost()
 end
 function cm.actarget2(e,te,tp)
-	return te:GetHandler():IsType(TYPE_SPELL+TYPE_TRAP)
+	return te:GetHandler():GetOriginalType()==TYPE_SPELL or te:GetHandler():GetOriginalType()==TYPE_TRAP
 end
 function cm.costchk2(e,te_or_c,tp)
 	return Duel.IsExistingMatchingCard(cm.cfilter,tp,LOCATION_DECK,0,1,nil)

expansions/script/c16105000.lua

@@ -58,10 +58,10 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 end
 function cm.thsplimit(e,c,sump,sumtype,sumpos,targetp,se)
-	return not (c:IsLevel(10) or c:IsRank(10) or c:IsSetCard(0xcc3)) and bit.band(sumtp,SUMMON_TYPE_PENDULUM)==SUMMON_TYPE_PENDULUM
+	return not (c:IsLevel(10) or c:IsRank(10) or c:IsSetCard(0xcc3))
 end
 function cm.splimit(e,c,tp,sumtp,sumpos)
-	return not (c:IsSetCard(0xcc3) or c:IsLevel(10) or c:IsRank(10))
+	return not (c:IsSetCard(0xcc3) or c:IsLevel(10) or c:IsRank(10)) and bit.band(sumtp,SUMMON_TYPE_PENDULUM)==SUMMON_TYPE_PENDULUM
 end
 function cm.filter(c)
 	return c:IsFaceup() and c:GetLevel()>0 and c:GetLevel()~=1

expansions/script/c16105004.lua

@@ -154,7 +154,7 @@ function cm.thfilter(c)
 	return c:IsLevel(10) and c:IsAbleToHand()
 end
 function cm.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetActivityCount(tp,ACTIVITY_SPSUMMON)==0 end
+	if chk==0 then return Duel.GetCustomActivityCount(m,tp,ACTIVITY_SPSUMMON)==0 end
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
@@ -169,7 +169,7 @@ function cm.thsplimit(e,c,sump,sumtype,sumpos,targetp,se)
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then
-	   return Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_GRAVE,0,1,nil)
+	   return Duel.IsExistingMatchingCard(Card.IsLevel,tp,LOCATION_MZONE,0,1,nil,10) and Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_GRAVE,0,1,nil)
 	end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,e:GetHandler(),1,tp,LOCATION_EXTRA)
 end
@@ -182,4 +182,5 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.SelectMatchingCard(tp,cm.thfiter,tp,LOCATION_GRAVE,0,1,1,nil)
 	g:Merge(tc)
 	Duel.SendtoHand(g,nil,REASON_EFFECT)
+	Duel.ConfirmCards(1-tp,g)
 end
\ No newline at end of file