Replace c16369115.lua

expansions/script/c16369115.lua

@@ -44,7 +44,7 @@ function c16369115.target(e,tp,eg,ep,ev,re,r,rp,chk)
 		local chkf=tp
 		local mg1=Duel.GetFusionMaterial(tp)
 		if Duel.IsExistingMatchingCard(c16369115.cfilter,tp,LOCATION_MZONE,0,1,nil) then
-			local mg2=Duel.GetMatchingGroup(c16369115.filter0,tp,LOCATION_DECK+LOCATION_EXTRA,0,nil)
+			local mg2=Duel.GetMatchingGroup(c16369115.filter0,tp,LOCATION_DECK,0,nil)
 			if mg2:GetCount()>0 then
 				mg1:Merge(mg2)
 				aux.FCheckAdditional=c16369115.fcheck
@@ -72,7 +72,7 @@ function c16369115.activate(e,tp,eg,ep,ev,re,r,rp)
 	local mg1=Duel.GetFusionMaterial(tp):Filter(c16369115.filter1,nil,e)
 	local exmat=false
 	if Duel.IsExistingMatchingCard(c16369115.cfilter,tp,LOCATION_MZONE,0,1,nil) then
-		local mg2=Duel.GetMatchingGroup(c16369115.filter0,tp,LOCATION_DECK+LOCATION_EXTRA,0,nil)
+		local mg2=Duel.GetMatchingGroup(c16369115.filter0,tp,LOCATION_DECK,0,nil)
 		if mg2:GetCount()>0 then
 			mg1:Merge(mg2)
 			exmat=true
@@ -120,6 +120,18 @@ function c16369115.activate(e,tp,eg,ep,ev,re,r,rp)
 		end
 		tc:CompleteProcedure()
 	end
+	if not e:IsHasType(EFFECT_TYPE_ACTIVATE) then return end
+	local e2=Effect.CreateEffect(e:GetHandler())
+	e2:SetType(EFFECT_TYPE_FIELD)
+	e2:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
+	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e2:SetTargetRange(1,0)
+	e2:SetTarget(c16369115.splimit)
+	e2:SetReset(RESET_PHASE+PHASE_END)
+	Duel.RegisterEffect(e2,tp)
+end
+function c16369115.splimit(e,c)
+	return not c:IsSetCard(0xcb1) and c:IsLocation(LOCATION_EXTRA)
 end
 function c16369115.thfilter(c)
 	return c:IsSetCard(0xcb1) and c:IsLevel(10) and c:IsAbleToHand()