2021/5/5 重写了花牙的“回合结束时返回卡组”的效果，修正执念之龙的提示错误

script/c120170017.lua

@@ -43,7 +43,7 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 		tc:RegisterEffect(e1)
 		if Duel.GetLocationCount(tp,LOCATION_SZONE)>0
 			and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(cm.setfilter),tp,LOCATION_GRAVE,0,1,nil)
-			and Duel.SelectYesNo(tp,aux.Stringid(m,1)) then
+			and Duel.SelectYesNo(tp,aux.Stringid(m,2)) then
 			Duel.BreakEffect()
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
 			local sg=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(cm.setfilter),tp,LOCATION_GRAVE,0,1,1,nil)

script/c120170029.lua

@@ -44,7 +44,7 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 		Duel.BreakEffect()
 		local c=e:GetHandler()
 		if Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)~=0 then
-			tc:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,1))
+			tc:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,m,aux.Stringid(m,1))
 			local e1=Effect.CreateEffect(c)
 			e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 			e1:SetCode(EVENT_PHASE+PHASE_END)
@@ -55,25 +55,25 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 			e1:SetOperation(cm.tdop)
 			Duel.RegisterEffect(e1,tp)
 			if c:IsFaceup() and c:IsRelateToEffect(e) then
-				local e1=Effect.CreateEffect(c)
-				e1:SetDescription(aux.Stringid(m,2))
-				e1:SetType(EFFECT_TYPE_SINGLE)
-				e1:SetCode(EFFECT_CANNOT_DIRECT_ATTACK)
-				e1:SetProperty(EFFECT_FLAG_CLIENT_HINT)
-				e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
-				c:RegisterEffect(e1)
+				local e2=Effect.CreateEffect(c)
+				e2:SetDescription(aux.Stringid(m,2))
+				e2:SetType(EFFECT_TYPE_SINGLE)
+				e2:SetCode(EFFECT_CANNOT_DIRECT_ATTACK)
+				e2:SetProperty(EFFECT_FLAG_CLIENT_HINT)
+				e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
+				c:RegisterEffect(e2)
 			end
 		end
 	end
 end
 function cm.tdcon(e,tp,eg,ep,ev,re,r,rp)
 	local tc=e:GetLabelObject()
-	if tc:IsLocation(LOCATION_MZONE) and tc:IsSummonType(SUMMON_TYPE_SPECIAL)
-		and tc:GetReasonEffect():GetHandler()==e:GetHandler() then return true
-	else
+	local fids={tc:GetFlagEffectLabel(tc,0)}
+	for i=1,#fids do
+		if fids[i]==m then return true end
+	end
 	e:Reset()
 	return false
-	end
 end
 function cm.tdop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.SendtoDeck(e:GetLabelObject(),nil,1,REASON_EFFECT)

script/c120170031.lua

@@ -38,7 +38,7 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.SelectMatchingCard(tp,cm.spfilter,tp,LOCATION_HAND,0,1,1,nil,e,tp)
 	local tc=g:GetFirst()
 	if tc and Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)~=0 then
-		tc:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,1))
+		tc:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,m,aux.Stringid(m,1))
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 		e1:SetCode(EVENT_PHASE+PHASE_END)
@@ -52,12 +52,12 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 end
 function cm.tdcon(e,tp,eg,ep,ev,re,r,rp)
 	local tc=e:GetLabelObject()
-	if tc:IsLocation(LOCATION_MZONE) and tc:IsSummonType(SUMMON_TYPE_SPECIAL)
-		and tc:GetReasonEffect():GetHandler()==e:GetHandler() then return true
-	else
+	local fids={tc:GetFlagEffectLabel(tc,0)}
+	for i=1,#fids do
+		if fids[i]==m then return true end
+	end
 	e:Reset()
 	return false
-	end
 end
 function cm.tdop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.SendtoDeck(e:GetLabelObject(),nil,1,REASON_EFFECT)

script/c120170048.lua

@@ -32,7 +32,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(cm.spfilter),tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
 	local tc=g:GetFirst()
 	if tc and Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)~=0 then
-		tc:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(m,1))
+		tc:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,m,aux.Stringid(m,1))
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 		e1:SetCode(EVENT_PHASE+PHASE_END)
@@ -46,12 +46,12 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 end
 function cm.tdcon(e,tp,eg,ep,ev,re,r,rp)
 	local tc=e:GetLabelObject()
-	if tc:IsLocation(LOCATION_MZONE) and tc:IsSummonType(SUMMON_TYPE_SPECIAL)
-		and tc:GetReasonEffect():GetHandler()==e:GetHandler() then return true
-	else
+	local fids={tc:GetFlagEffectLabel(tc,0)}
+	for i=1,#fids do
+		if fids[i]==m then return true end
+	end
 	e:Reset()
 	return false
-	end
 end
 function cm.tdop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.SendtoDeck(e:GetLabelObject(),nil,1,REASON_EFFECT)