E

expansions/script/c15000850.lua

@@ -53,7 +53,10 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.atkval(e,c)
-	return Duel.GetMatchingGroupCount(Card.IsType,c:GetControler(),LOCATION_ONFIELD,LOCATION_ONFIELD,nil,TYPE_EQUIP)*1000
+	return Duel.GetMatchingGroupCount(cm.eqfilter,c:GetControler(),LOCATION_ONFIELD,LOCATION_ONFIELD,nil)*1000
+end
+function cm.eqfilter(c)
+	return c:IsType(TYPE_EQUIP) and c:IsFaceup()
 end
 function cm.eqsfilter(c,tp)
 	return c:IsType(TYPE_EQUIP) and Duel.IsExistingMatchingCard(cm.eqmfilter,tp,LOCATION_DECK,0,1,nil,c) and not c:IsPublic()

expansions/script/c15000866.lua

@@ -27,6 +27,9 @@ end
 function cm.filter(c)
 	return c:IsCode(15000862) and c:IsAbleToHand()
 end
+function cm.nfilter(c)
+	return (aux.NegateMonsterFilter(c) or c:IsType(TYPE_SPELL) or c:IsType(TYPE_TRAP)) and c:IsFaceup()
+end
 function cm.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_DECK,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
@@ -40,7 +43,7 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp)
 		if Duel.IsExistingMatchingCard(Card.IsFaceup,tp,0,LOCATION_ONFIELD,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
 			Duel.BreakEffect()
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISABLE)
-			local ag=Duel.SelectMatchingCard(tp,Card.IsFaceup,tp,0,LOCATION_ONFIELD,1,1,nil)
+			local ag=Duel.SelectMatchingCard(tp,cm.nfilter,tp,0,LOCATION_ONFIELD,1,1,nil)
 			local bc=ag:GetFirst()
 			if bc then
 				Duel.NegateRelatedChain(bc,RESET_TURN_SET)

expansions/script/c75646970.lua

@@ -77,7 +77,7 @@ end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) and Duel.GetMZoneCount(tp)>0 and Duel.IsPlayerCanSpecialSummonMonster(tp,m+1,0xa2c2,0x21,2800,2000,8,RACE_PSYCHO,ATTRIBUTE_WATER) then
-		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
+		Duel.SpecialSummonStep(c,0,tp,tp,false,false,POS_FACEUP)
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
 		e1:SetCode(EVENT_MOVE)
@@ -91,6 +91,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 		c:SetEntityCode(tcode,true)
 		c:ReplaceEffect(tcode,RESET_EVENT+0x7e0000)
 		c:RegisterFlagEffect(m,0,0,0)
+		Duel.SpecialSummonComplete()
 	end
 end
 function cm.backon(e,tp,eg,ep,ev,re,r,rp)