fix

expansions/script/c6100032.lua

@@ -28,6 +28,10 @@ function cm.initial_effect(c)
 	e3:SetTarget(cm.sptg)
 	e3:SetOperation(cm.spop)
 	c:RegisterEffect(e3)
+	Duel.AddCustomActivityCounter(m,ACTIVITY_SPSUMMON,cm.counterfilter)
+end
+function cm.counterfilter(c)
+	return not c:IsSummonLocation(LOCATION_EXTRA) or c:IsType(TYPE_XYZ)
 end
 function cm.filter(c)
 	return c:IsSetCard(0x61b) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
@@ -52,8 +56,7 @@ function cm.atkval(e,c)
 	return Duel.GetFieldGroupCount(c:GetControler(),0,LOCATION_GRAVE)*100
 end
 function cm.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.CheckRemoveOverlayCard(tp,1,0,1,REASON_EFFECT) end
-	Duel.RemoveOverlayCard(tp,1,0,1,1,REASON_COST)
+	if chk==0 then return Duel.CheckRemoveOverlayCard(tp,1,0,1,REASON_EFFECT) and Duel.GetCustomActivityCount(m,tp,ACTIVITY_SPSUMMON)==0 end
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
@@ -62,6 +65,10 @@ function cm.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e1:SetTargetRange(1,0)
 	e1:SetTarget(cm.splimit)
 	Duel.RegisterEffect(e1,tp)
+	Duel.RemoveOverlayCard(tp,1,0,1,1,REASON_COST)
+end
+function cm.splimit(e,c,sump,sumtype,sumpos,targetp,se)
+	return not c:IsType(TYPE_XYZ) and c:IsLocation(LOCATION_EXTRA)
 end
 function cm.spfilter(c,e,sp)
 	return c:IsLevel(4) and c:IsCanBeSpecialSummoned(e,0,sp,false,false)
@@ -72,14 +79,12 @@ function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
-	if Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)>0 then return end
+	local g=Duel.GetMatchingGroup(cm.spfilter,tp,LOCATION_DECK,0,nil,e,tp)
+	if Duel.RemoveOverlayCard(tp,1,0,1,1,REASON_EFFECT)~=0
+		and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and g:GetCount()>0 then
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectMatchingCard(tp,cm.spfilter,tp,LOCATION_HAND,0,1,1,nil,e,tp)
-	if g:GetCount()>0 then
-		Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
+	local sg=g:Select(tp,1,1,nil)
+	if sg:GetCount()>0 then
+		Duel.SpecialSummon(sg,0,tp,tp,false,false,POS_FACEUP)
 	end
-end
-function cm.splimit(e,c)
-	return not c:IsType(TYPE_XYZ) and c:IsLocation(LOCATION_EXTRA)
 end
\ No newline at end of file

expansions/script/c6100034.lua

@@ -90,11 +90,11 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
 		Duel.SendtoHand(c,nil,REASON_EFFECT)
-		if Duel.GetMatchingGroupCount(nil,1-tp,LOCATION_GRAVE,0,nil)>=5
+		if Duel.GetMatchingGroupCount(nil,1-tp,LOCATION_GRAVE,0,nil)>=5 
 			and Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
-			local tc=Duel.SelectMatchingCard(tp,nil,tp,0,LOCATION_MZONE,1,1,nil)
+			local tc=Duel.SelectMatchingCard(tp,nil,tp,0,LOCATION_MZONE,1,1,nil):GetFirst()
 			local f=Duel.GetMatchingGroupCount(nil,1-tp,LOCATION_GRAVE,0,nil)
-			if tc:IsPosition(POS_FACEUP) then
+			if tc:IsFaceup() then
 			local e1=Effect.CreateEffect(e:GetHandler())
 			e1:SetType(EFFECT_TYPE_SINGLE)
 			e1:SetCode(EFFECT_UPDATE_ATTACK)
@@ -102,6 +102,6 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 			e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 			tc:RegisterEffect(e1)
 			end
-		end	 
+		end  
 	end
-end
\ No newline at end of file
+end