得得得得得

expansions/script/c53702500.lua

@@ -2,24 +2,24 @@ SNNM=SNNM or {}
 local cm=SNNM
 --53702700 alleffectreset
 function cm.AllGlobalCheck(c)
-	if not cm.global_check then
-		cm.global_check=true
+	if not cm.snnm_global_check then
+		cm.snnm_global_check=true
 		local x=c:GetOriginalCodeRule()
-		if x>=53707000 and x<=53707099 then
+		if c.main_peacecho then
 			local alle1=Effect.CreateEffect(c)
 			alle1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 			alle1:SetCode(EFFECT_SEND_REPLACE)
 			alle1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 			alle1:SetTarget(cm.PeacechoToDeckTarget1)
 			alle1:SetValue(function(e,c) return false end)
-			Duel.RegisterEffect(alle1,0)
+			--Duel.RegisterEffect(alle1,0)
 			local alle2=Effect.CreateEffect(c)
 			alle2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 			alle2:SetCode(EFFECT_SEND_REPLACE)
 			alle2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 			alle2:SetTarget(cm.PeacechoToDeckTarget2)
 			alle2:SetValue(function(e,c) return c:GetFlagEffect(53707099)>0 end)
-			Duel.RegisterEffect(alle2,0)
+			--Duel.RegisterEffect(alle2,0)
 			cm[0]=Duel.GetDecktopGroup
 			Duel.GetDecktopGroup=function(tp,ct)
 				Duel.RegisterFlagEffect(tp,53707000,RESET_CHAIN,0,0)
@@ -38,7 +38,8 @@ function cm.AllGlobalCheck(c)
 				g=g:Select(player,min,max,reason)
 				Duel.SendtoGrave(g,reason)
 				local ct=Duel.GetOperatedGroup():GetCount()
-				if ct>0 then return 1 else return 0 end
+				--if ct>0 then return 1 else return 0 end
+				return ct
 			end
 			cm[3]=Duel.RemoveOverlayCard
 			Duel.RemoveOverlayCard=function(player,ints,into,min,max,reason)
@@ -51,18 +52,21 @@ function cm.AllGlobalCheck(c)
 				sg=sg:Select(player,min,max,reason)
 				Duel.SendtoGrave(sg,reason)
 				local ct=Duel.GetOperatedGroup():GetCount()
-				if ct>0 then return 1 else return 0 end
+				--if ct>0 then return 1 else return 0 end
+				return ct
 			end
 			cm[4]=Duel.SendtoGrave
 			Duel.SendtoGrave=function(target,reason)
-				local tg=Group.__add(target,target)
-				local g=tg:Filter(function(c)return c:IsLocation(LOCATION_OVERLAY) and c:IsOriginalSetCard(0x3537) and not c:IsHasEffect(EFFECT_TO_GRAVE_REDIRECT) and c:GetOriginalType()&TYPE_PENDULUM+TYPE_LINK==0 and c:IsAbleToDeck()end,nil)
-				for tc in aux.Next(g) do
-					Duel.Hint(HINT_CARD,0,tc:GetOriginalCodeRule())
-					Duel.SendtoDeck(tc,nil,1,reason)
-					tc:ReverseInDeck()
-				end
-				cm[4](Group.__sub(tg,g),reason)
+				if reason&REASON_RULE==0 then
+					local tg=Group.__add(target,target)
+					local g=tg:Filter(function(c)return c:IsLocation(LOCATION_OVERLAY) and c.main_peacecho and not c:IsHasEffect(EFFECT_TO_GRAVE_REDIRECT) and c:IsAbleToDeck()end,nil)
+					for tc in aux.Next(g) do
+						Duel.Hint(HINT_CARD,0,tc:GetOriginalCodeRule())
+						Duel.SendtoDeck(tc,nil,1,reason)
+						tc:ReverseInDeck()
+					end
+					return cm[4](Group.__sub(tg,g),reason)
+				else return cm[4](target,reason) end
 			end
 			--cm[2]=Card.ReverseInDeck
 			--Card.ReverseInDeck=function(card)
@@ -70,21 +74,21 @@ function cm.AllGlobalCheck(c)
 				--return cm[2](card)
 			--end
 		end
-		if x>=53713000 and x<=53713099 then
+		if c.alc_yaku then
 			local alle3=Effect.CreateEffect(c)
 			alle3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 			alle3:SetCode(EVENT_SSET)
 			alle3:SetOperation(cm.ALCYakuCheck)
 			Duel.RegisterEffect(alle3,0)
 		end
-		if x>=53703000 and x<=53703099 then
+		if c.organic_saucer then
 			local alle4=Effect.CreateEffect(c)
 			alle4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 			alle4:SetCode(EVENT_SPSUMMON_SUCCESS)
 			alle4:SetOperation(cm.OSCheck)
 			Duel.RegisterEffect(alle4,0)
 		end
-		if x>=53727004 and x<=53727007 then
+		if c.cybern_numc then
 			local alle6=Effect.CreateEffect(c)
 			alle6:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 			alle6:SetCode(EVENT_CHAINING)
@@ -113,9 +117,20 @@ function cm.UpConfirm()
 	if #UCg>0 then Duel.Hint(HINT_OPSELECTED,tp,aux.Stringid(53702500,2)) end
 	if #UCg==1 then UCg:Select(tp,1,1,nil) elseif #UCg>1 then Duel.ConfirmCards(tp,UCg) end
 end
-function cm.Peacecho(c)
+function cm.Peacecho(c,typ)
 	Duel.EnableGlobalFlag(GLOBALFLAG_DECK_REVERSE_CHECK)
-	if c:GetOriginalType()&TYPE_MONSTER~=0 then
+	local e1=Effect.CreateEffect(c)
+	e1:SetCode(EFFECT_SEND_REPLACE)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
+	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e1:SetRange(0xff)
+	e1:SetTarget(cm.RePeacechotg1)
+	e1:SetOperation(cm.RePeacechoop)
+	c:RegisterEffect(e1)
+	local e2=e1:Clone()
+	e2:SetTarget(cm.RePeacechotg2)
+	c:RegisterEffect(e2)
+	if typ==TYPE_MONSTER then
 		local e4=Effect.CreateEffect(c)
 		e4:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DRAW)
 		e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
@@ -125,7 +140,7 @@ function cm.Peacecho(c)
 		e4:SetOperation(cm.PeacechoDrawOperation)
 		c:RegisterEffect(e4)
 	end
-	if c:GetOriginalType()&0x20004~=0 then
+	if typ==TYPE_CONTINUOUS then
 		local e5=Effect.CreateEffect(c)
 		e5:SetCategory(CATEGORY_DRAW)
 		e5:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
@@ -135,7 +150,7 @@ function cm.Peacecho(c)
 		e5:SetOperation(cm.PeacechoDrawOperation2)
 		c:RegisterEffect(e5)
 	end
-	if c:GetOriginalType()&TYPE_FIELD~=0 then
+	if typ==TYPE_FIELD then
 		local e6=Effect.CreateEffect(c)
 		e6:SetCategory(CATEGORY_DRAW)
 		e6:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
@@ -152,6 +167,36 @@ function cm.Peacecho(c)
 	e9:SetOperation(cm.UpRegi)
 	c:RegisterEffect(e9)
 end
+function cm.RePeacechotg1(e,tp,eg,ep,ev,re,r,rp,chk)
+	local c=e:GetHandler()
+	if chk==0 then return not c:IsLocation(LOCATION_DECK) and c:GetDestination()==LOCATION_GRAVE and not c:IsHasEffect(EFFECT_TO_GRAVE_REDIRECT) and c:IsAbleToDeck() end
+	return true
+end
+function cm.RePeacechotg2(e,tp,eg,ep,ev,re,r,rp,chk)
+	local c=e:GetHandler()
+	if chk==0 then return c:IsLocation(LOCATION_DECK) and c:GetDestination()==LOCATION_GRAVE and not c:IsHasEffect(EFFECT_TO_GRAVE_REDIRECT) and Duel.GetFieldGroup(tp,LOCATION_DECK,0):GetMinGroup(Card.GetSequence):GetFirst()~=c end
+	return true
+end
+function cm.RePeacechoop(e,tp,eg,ep,ev,re,r,rp,chk)
+	local c=e:GetHandler()
+	if c:IsFacedown() then Duel.ConfirmCards(1-tp,c) end
+	Duel.Hint(HINT_CARD,0,c:GetOriginalCode())
+	if c:IsLocation(LOCATION_DECK) then
+		if Duel.GetFlagEffect(tp,53707000)==0 then Duel.ShuffleDeck(tp) end
+		local e3=Effect.CreateEffect(c)
+		e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+		e3:SetCode(EVENT_CHAIN_SOLVED)
+		e3:SetOperation(cm.RePeacechorst)
+		e3:SetLabelObject(e)
+		Duel.RegisterEffect(e3,tp)
+		Duel.MoveSequence(c,1)
+	else Duel.SendtoDeck(c,nil,1,REASON_RULE) end
+	c:ReverseInDeck()
+end
+function cm.RePeacechorst(e,tp,eg,ep,ev,re,r,rp,chk)
+	Duel.ResetFlagEffect(tp,53707000)
+	e:Reset()
+end
 function cm.PeacechoRepFilter(c)
 	return c:GetDestination()==LOCATION_GRAVE and c:IsOriginalSetCard(0x3537) and not c:IsHasEffect(EFFECT_TO_GRAVE_REDIRECT) and c:GetOriginalType()&TYPE_PENDULUM+TYPE_LINK==0 and c:IsAbleToDeck()
 end
@@ -328,7 +373,7 @@ function cm.GraveActCostTarget(e,te,tp)
 	return te:GetHandler()==e:GetHandler() and te:IsHasType(EFFECT_TYPE_ACTIVATE)
 end
 function cm.GraveActCostOp(e,tp,eg,ep,ev,re,r,rp)
-	Duel.MoveToField(e:GetHandler(),tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+	Duel.MoveToField(e:GetHandler(),tp,tp,LOCATION_SZONE,POS_FACEUP,false)
 end
 function cm.FanippetTrapSPCondition(e,tp,eg,ep,ev,re,r,rp)
 	return rp==1-tp or ep==1-tp or re:GetHandler():IsCode(53716006)
@@ -339,8 +384,19 @@ function cm.FanippetTrapSPCost(code)
 		local c=e:GetHandler()
 		if chk==0 then return Duel.GetFlagEffect(tp,code)==0 and not c:IsLocation(LOCATION_ONFIELD) end
 		Duel.RegisterFlagEffect(tp,code,RESET_CHAIN,0,1)
+		local e3=Effect.CreateEffect(c)
+		e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+		e3:SetCode(EVENT_CHAIN_SOLVING)
+		e3:SetOperation(cm.Fanippetready)
+		e3:SetLabelObject(e)
+		Duel.RegisterEffect(e3,tp)
 	end
 end
+function cm.ready(e,tp)
+	e:GetLabelObject():GetHandler():SetStatus(STATUS_EFFECT_ENABLED,true)
+	e:GetLabelObject():Reset()
+	e:Reset()
+end
 function cm.FanippetTrapSPTarget(code,atk,def,rac,att)
 	return
 	function(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -349,7 +405,7 @@ function cm.FanippetTrapSPTarget(code,atk,def,rac,att)
 		if not c:IsPreviousLocation(LOCATION_HAND) then
 			e:SetCategory(CATEGORY_SPECIAL_SUMMON)
 			Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,0,0)
-		end
+		else e:SetCategory(0) end
 		e:SetLabel(c:GetPreviousLocation())
 	end
 end
@@ -2530,6 +2586,11 @@ function cm.AllEffectRstop(e,tp,eg,ep,ev,re,r,rp)
 			end
 		end
 		end
+		if cm.IsInTable(53796002,rstt) then
+		if se:GetRange()==LOCATION_PZONE and se:GetProperty()&EFFECT_FLAG_UNCOPYABLE==0 then
+			_G["c"..sc:GetOriginalCode()].pend_effect=se
+		end
+		end
 		if cm.IsInTable(53799017,rstt) then
 		if se:GetType()==EFFECT_TYPE_ACTIVATE then
 			local tg=se:GetTarget()

expansions/script/c53703001.lua

 local m=53703001
 local cm=_G["c"..m]
 cm.name="圆盘生物 希尔巴布尔美"
+cm.organic_saucer=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
 	SNNM.OrganicSaucer(c,1,m)

expansions/script/c53703002.lua

 local m=53703002
 local cm=_G["c"..m]
 cm.name="圆盘生物 布莱克多姆"
+cm.organic_saucer=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
 	SNNM.OrganicSaucer(c,2,m)

expansions/script/c53703003.lua

 local m=53703003
 local cm=_G["c"..m]
 cm.name="圆盘生物 阿布索巴"
+cm.organic_saucer=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
 	SNNM.OrganicSaucer(c,4,m)

expansions/script/c53703004.lua

 local m=53703004
 local cm=_G["c"..m]
 cm.name="圆盘生物 迪莫斯"
+cm.organic_saucer=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
 	SNNM.AllGlobalCheck(c)

expansions/script/c53703005.lua

 local m=53703005
 local cm=_G["c"..m]
 cm.name="圆盘生物 布莱克卡戎"
+cm.organic_saucer=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
 	SNNM.OrganicSaucer(c,5,m)

expansions/script/c53703006.lua

 local m=53703006
 local cm=_G["c"..m]
 cm.name="圆盘生物 布里扎德"
+cm.organic_saucer=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
 	SNNM.OrganicSaucer(c,6,m)

expansions/script/c53703007.lua

 local m=53703007
 local cm=_G["c"..m]
 cm.name="圆盘生物 汉古拉"
+cm.organic_saucer=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
 	SNNM.OrganicSaucer(c,3,m)

expansions/script/c53703008.lua

 local m=53703008
 local cm=_G["c"..m]
 cm.name="圆盘生物 布莱克特琳娜"
+cm.organic_saucer=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
 	SNNM.AllGlobalCheck(c)

expansions/script/c53707001.lua

 local m=53707001
 local cm=_G["c"..m]
 cm.name="清响 失语华"
+cm.main_peacecho=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
-	SNNM.Peacecho(c)
+	SNNM.Peacecho(c,TYPE_MONSTER)
 	SNNM.AllGlobalCheck(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))

expansions/script/c53707002.lua

 local m=53707002
 local cm=_G["c"..m]
 cm.name="清响 量理奏"
+cm.main_peacecho=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
-	SNNM.Peacecho(c)
+	SNNM.Peacecho(c,TYPE_MONSTER)
 	SNNM.AllGlobalCheck(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))
@@ -23,7 +24,6 @@ function cm.initial_effect(c)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e3:SetCountLimit(1,m)
-	e3:SetCost(cm.drcost)
 	e3:SetTarget(cm.drtg)
 	e3:SetOperation(cm.drop)
 	c:RegisterEffect(e3)
@@ -36,6 +36,7 @@ function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function cm.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsDiscardable() end
+	Duel.ConfirmCards(1-tp,e:GetHandler())
 	Duel.SendtoGrave(e:GetHandler(),REASON_COST+REASON_DISCARD)
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
@@ -54,21 +55,19 @@ end
 function cm.dcfilter(c)
 	return c:IsRace(RACE_PLANT) and c:IsAbleToRemoveAsCost(POS_FACEDOWN)
 end
-function cm.drcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.dcfilter,tp,LOCATION_DECK,0,1,nil) end
-	SNNM.UpConfirm()
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	local g=Duel.SelectMatchingCard(tp,cm.dcfilter,tp,LOCATION_DECK,0,1,1,nil)
-	Duel.ConfirmCards(1-tp,g)
-	Duel.Remove(g,POS_FACEDOWN,REASON_COST)
-end
 function cm.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end
+	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) and Duel.IsExistingMatchingCard(cm.dcfilter,tp,LOCATION_DECK,0,1,nil) end
 	Duel.SetTargetPlayer(tp)
 	Duel.SetTargetParam(1)
-	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
+	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_DECK)
 end
 function cm.drop(e,tp,eg,ep,ev,re,r,rp)
 	local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
 	Duel.Draw(p,d,REASON_EFFECT)
+	if not Duel.IsExistingMatchingCard(cm.dcfilter,tp,LOCATION_DECK,0,1,nil) then return end
+	SNNM.UpConfirm()
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
+	local g=Duel.SelectMatchingCard(tp,cm.dcfilter,tp,LOCATION_DECK,0,1,1,nil)
+	Duel.ConfirmCards(1-tp,g)
+	Duel.Remove(g,POS_FACEDOWN,REASON_EFFECT)
 end

expansions/script/c53707003.lua

 local m=53707003
 local cm=_G["c"..m]
 cm.name="清响 念星觉"
+cm.main_peacecho=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
-	SNNM.Peacecho(c)
+	SNNM.Peacecho(c,TYPE_MONSTER)
 	SNNM.AllGlobalCheck(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))

expansions/script/c53707004.lua

 local m=53707004
 local cm=_G["c"..m]
 cm.name="清响 祈明蝶"
+cm.main_peacecho=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
-	SNNM.Peacecho(c)
+	SNNM.Peacecho(c,TYPE_MONSTER)
 	SNNM.AllGlobalCheck(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))

expansions/script/c53707005.lua

 local m=53707005
 local cm=_G["c"..m]
 cm.name="清响 旋虑刃"
+cm.main_peacecho=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
-	SNNM.Peacecho(c)
+	SNNM.Peacecho(c,TYPE_MONSTER)
 	SNNM.AllGlobalCheck(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))

expansions/script/c53707007.lua

 local m=53707007
 local cm=_G["c"..m]
 cm.name="清响 遗往镜"
+cm.main_peacecho=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
-	SNNM.Peacecho(c)
+	SNNM.Peacecho(c,TYPE_MONSTER)
 	SNNM.AllGlobalCheck(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))

expansions/script/c53707008.lua

 local m=53707008
 local cm=_G["c"..m]
 cm.name="清响 妍叙梦"
+cm.main_peacecho=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
-	SNNM.Peacecho(c)
+	SNNM.Peacecho(c,TYPE_MONSTER)
 	SNNM.AllGlobalCheck(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))

expansions/script/c53707009.lua

 local m=53707009
 local cm=_G["c"..m]
 cm.name="清响 沉水观"
+cm.main_peacecho=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
-	SNNM.Peacecho(c)
+	SNNM.Peacecho(c,TYPE_MONSTER)
 	SNNM.AllGlobalCheck(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)

expansions/script/c53707013.lua

 local m=53707013
 local cm=_G["c"..m]
 cm.name="清响 雨间美"
+cm.main_peacecho=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
-	SNNM.Peacecho(c)
+	SNNM.Peacecho(c,TYPE_MONSTER)
 	SNNM.AllGlobalCheck(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))

expansions/script/c53707014.lua

 local m=53707014
 local cm=_G["c"..m]
 cm.name="清响 霭占妆"
+cm.main_peacecho=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
-	SNNM.Peacecho(c)
+	SNNM.Peacecho(c,TYPE_MONSTER)
 	SNNM.AllGlobalCheck(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))

expansions/script/c53707015.lua

 local m=53707015
 local cm=_G["c"..m]
 cm.name="清响 怅眠心"
+cm.main_peacecho=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
-	SNNM.Peacecho(c)
+	SNNM.Peacecho(c,TYPE_MONSTER)
 	SNNM.AllGlobalCheck(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)

expansions/script/c53707016.lua

 local m=53707016
 local cm=_G["c"..m]
 cm.name="清响 抄染扉"
+cm.main_peacecho=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
-	SNNM.Peacecho(c)
+	SNNM.Peacecho(c,TYPE_MONSTER)
 	SNNM.AllGlobalCheck(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))

expansions/script/c53707017.lua

 local m=53707017
 local cm=_G["c"..m]
 cm.name="幽谷清响"
+cm.main_peacecho=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
-	SNNM.Peacecho(c)
+	SNNM.Peacecho(c,TYPE_FIELD)
 	SNNM.AllGlobalCheck(c)
 	local e0=Effect.CreateEffect(c)
 	e0:SetType(EFFECT_TYPE_ACTIVATE)

expansions/script/c53707020.lua

 local m=53707020
 local cm=_G["c"..m]
 cm.name="幽林清响"
+cm.main_peacecho=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
-	SNNM.Peacecho(c)
+	SNNM.Peacecho(c,TYPE_CONTINUOUS)
 	SNNM.AllGlobalCheck(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)

expansions/script/c53713001.lua

 local m=53713001
 local cm=_G["c"..m]
 cm.name="爱丽丝役 TRS"
+cm.alc_yaku=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
 	SNNM.ALCYakuNew(c,m,cm.confirm,LOCATION_HAND,{1900,300,4,RACE_WARRIOR,ATTRIBUTE_DARK})

expansions/script/c53713003.lua

 local m=53713003
 local cm=_G["c"..m]
 cm.name="爱丽丝役 TIS"
+cm.alc_yaku=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
 	SNNM.ALCYakuNew(c,m,cm.confirm,LOCATION_DECK,{200,2200,4,RACE_WARRIOR,ATTRIBUTE_DARK})

expansions/script/c53713005.lua

 local m=53713005
 local cm=_G["c"..m]
 cm.name="爱丽丝役 HNS"
+cm.alc_yaku=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
 	SNNM.ALCYakuNew(c,m,cm.confirm,LOCATION_EXTRA,{1800,1800,4,RACE_WARRIOR,ATTRIBUTE_DARK})

expansions/script/c53713007.lua

 local m=53713007
 local cm=_G["c"..m]
 cm.name="爱丽丝役 ICG"
+cm.alc_yaku=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
 	SNNM.ALCYakuNew(c,m,cm.confirm,LOCATION_ONFIELD,{100,100,4,RACE_SPELLCASTER,ATTRIBUTE_LIGHT})

expansions/script/c53727004.lua

 local m=53727004
 local cm=_G["c"..m]
 cm.name="空间撕裂"
+cm.cybern_numc=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
 	aux.AddCodeList(c,53727003)
@@ -88,8 +89,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.distg1(e,c)
-	local tc=e:GetLabelObject()
-	if c:IsType(TYPE_SPELL+TYPE_TRAP) then return c:IsOriginalCodeRule(tc:GetOriginalCodeRule()) else return c:IsOriginalCodeRule(tc:GetOriginalCodeRule()) and (c:IsType(TYPE_EFFECT) or c:GetOriginalType()&TYPE_EFFECT~=0) end
+	if c:IsType(TYPE_SPELL+TYPE_TRAP) then return c:IsOriginalCodeRule(e:GetLabelObject():GetOriginalCodeRule()) else return c:IsOriginalCodeRule(e:GetLabelObject():GetOriginalCodeRule()) and (c:IsType(TYPE_EFFECT) or c:GetOriginalType()&TYPE_EFFECT~=0) end
 end
 function cm.discon(e,tp,eg,ep,ev,re,r,rp)
 	return re:GetHandler():IsOriginalCodeRule(e:GetLabelObject():GetOriginalCodeRule())

expansions/script/c53727005.lua

 local m=53727005
 local cm=_G["c"..m]
 cm.name="信息对冲"
+cm.cybern_numc=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
 	aux.AddCodeList(c,53727003)

expansions/script/c53727006.lua

 local m=53727006
 local cm=_G["c"..m]
 cm.name="漏洞修复"
+cm.cybern_numc=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
 	aux.AddCodeList(c,53727003)

expansions/script/c53727007.lua

 local m=53727007
 local cm=_G["c"..m]
 cm.name="循环感染"
+cm.cybern_numc=true
 if not pcall(function() require("expansions/script/c53702500") end) then require("script/c53702500") end
 function cm.initial_effect(c)
 	aux.AddCodeList(c,53727003)