异响鸣新卡修复

script/c101204022.lua

@@ -28,7 +28,6 @@ function s.initial_effect(c)
 	e4:SetCode(EVENT_TO_GRAVE)
 	e4:SetProperty(EFFECT_FLAG_DELAY)
 	e4:SetCountLimit(1,id+o)
-	e4:SetCondition(s.thcon2)
 	e4:SetTarget(s.thtg2)
 	e4:SetOperation(s.thop2)
 	c:RegisterEffect(e4)
@@ -54,11 +53,9 @@ end
 function s.atcon(e)
 	return Duel.IsExistingMatchingCard(aux.NOT(Card.IsCode),e:GetHandlerPlayer(),LOCATION_MZONE,0,1,e:GetHandler(),id)
 end
-function s.thcon2(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_PZONE,0,2,nil,0x1a3)
-end
 function s.thtg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():IsAbleToHand() end
+	if chk==0 then return e:GetHandler():IsAbleToHand()
+		and Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_PZONE,0,2,nil,0x1a3) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,e:GetHandler(),1,0,0)
 end
 function s.thop2(e,tp,eg,ep,ev,re,r,rp)

script/c101204065.lua

@@ -5,6 +5,7 @@ function s.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOEXTRA+CATEGORY_SEARCH+CATEGORY_TOHAND)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetCountLimit(1,id+EFFECT_COUNT_CODE_OATH)
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.activate)
 	c:RegisterEffect(e1)
@@ -16,18 +17,29 @@ function s.thfilter(c,tp)
 	return c:IsSetCard(0x1a3) and c:IsType(TYPE_PENDULUM)
 		and (c:IsAbleToExtra() or c:IsAbleToHand())
 end
+function s.cfilter(c)
+	return not c:IsType(TYPE_PENDULUM) and c:IsSetCard(0x1a3)
+end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
+	local g=Duel.GetMatchingGroup(s.thfilter,tp,LOCATION_DECK,0,nil)
 	local b1=Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp)
-	local b2=Duel.IsExistingMatchingCard(s.thfilter1,tp,LOCATION_DECK,0,1,nil,tp)
-		and Duel.IsExistingMatchingCard(aux.NOT(Card.IsType),tp,LOCATION_MZONE,0,1,nil,TYPE_PENDULUM)
+	local b2=g:CheckSubGroup(s.Group,2,2)
+		and Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil,TYPE_PENDULUM)
 	if chk==0 then return b1 or b2 end
 end
+function s.thfilter2(c,g)
+	return c:IsAbleToExtra() and g:FilterCount(Card.IsAbleToHand,c)==1
+end
+function s.Group(g)
+	return aux.dncheck(g) and g:FilterCount(s.thfilter2,nil,g)~=0
+end
 function s.activate(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
 	local g=Duel.GetMatchingGroup(s.thfilter,tp,LOCATION_DECK,0,nil)
 	local b1=Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp)
-	local b2=g:CheckSubGroup(aux.dncheck,2,2)
+	local b2=g:CheckSubGroup(s.Group,2,2)
 		and Duel.IsExistingMatchingCard(aux.NOT(Card.IsType),tp,LOCATION_MZONE,0,1,nil,TYPE_PENDULUM)
 	local op=0
 	if b1 and b2 then
@@ -43,9 +55,16 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 		if sg:GetCount()>0 then
 			Duel.SpecialSummon(sg,0,tp,tp,false,false,POS_FACEUP)
 		end
+		local e1=Effect.CreateEffect(c)
+		e1:SetType(EFFECT_TYPE_FIELD)
+		e1:SetCode(EFFECT_CANNOT_TRIGGER)
+		e1:SetTargetRange(LOCATION_MZONE,0)
+		e1:SetTarget(s.target1)
+		e1:SetReset(RESET_PHASE+PHASE_END)
+		Duel.RegisterEffect(e1,tp)
 	elseif op==2 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-		sg=g:SelectSubGroup(tp,aux.dncheck,false,2,2)
+		sg=g:SelectSubGroup(tp,s.Group,false,2,2)
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 		local tc=sg:FilterSelect(tp,Card.IsAbleToHand,1,1,nil):GetFirst()
 		Duel.SendtoHand(tc,nil,REASON_EFFECT)
@@ -54,3 +73,6 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SendtoExtraP(sg,nil,REASON_EFFECT)
 	end
 end
+function s.target1(e,c)
+	return not c:IsSetCard(0x1a3)
+end
\ No newline at end of file

script/c101204066.lua

@@ -3,7 +3,7 @@ local s,id,o=GetID()
 function s.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(id,0))
-	e1:SetCategory(CATEGORY_RECOVER+CATEGORY_TOHAND+CATEGORY_DAMAGE+CATEGORY_COUNTER)
+	e1:SetCategory(CATEGORY_RECOVER+CATEGORY_TOHAND+CATEGORY_DAMAGE+CATEGORY_COUNTER+CATEGORY_GRAVE_ACTION)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetCountLimit(1,id+EFFECT_COUNT_CODE_OATH)