update 6.11

.gitlab-ci.yml

@@ -4,8 +4,8 @@ stages:
 
 variables:
   GIT_DEPTH: "1"
-  LAST_UPDATE_DATE: "2023.05.16"
-  CURRENT_UPDATE_DATE: "2023.05.30"
+  LAST_UPDATE_DATE: "2023.05.30"
+  CURRENT_UPDATE_DATE: "2023.06.11"
 
 redtext:
   stage: prepare

expansions/lflist.conf

@@ -907,6 +907,7 @@
 30666700 3 --拟龙贵族·谋士龙女
 30666725 1 --拟龙贵族·复仇龙女
 30683110 0 --M·A·L·Hydra
+30683305 0 --M·A·L·Growth Wedge
 30683425 0 --M·A·L——Null
 #307
 30700001 0 --龙裔的新生者
@@ -1130,7 +1131,6 @@
 33500933 0 --D.A.L 四糸乃·闪耀
 33501019 1 --壶宇融合
 33501024 0 --高原的魔女大人
-33501037 0 --书馆的荣誉魔女
 33501077 0 --神秘大魔法师
 33501086 0 --孤立无援
 33501091 0 --鸢之歌
@@ -1332,7 +1332,6 @@
 37564914 1 --Sayuri & 3L
 #379
 37900017 1 --不明的魔法之元
-37902000 0 --次元之书
 37987096 0 --优雅少女 苏娜
 #391
 39101001 0 --天才的宿命 白羊物语
@@ -1868,6 +1867,9 @@
 81902063 0 --TC.62 空想之上的人格保持者 古明地恋
 #854
 85402300 0 --栞
+#881
+88178301 0 --白玉楼的亡灵少女 幽幽子
+88178317 0 --生命的二刀流 魂魄妖梦
 #888
 88888244 0 --轮回崩坏 梅比乌斯
 88888255 0 --妖相百斩 SP洪荒无极
@@ -1915,6 +1917,7 @@
 96030180 0 --装填 冰橘火力
 96030181 0 --紧急投放
 96040002 0 --再来一杯
+96040020 0 --功能性饮料 原汁不原味
 #986
 98600002 0 --欧忒耳佩
 98600004 1 --情书

expansions/script/c12812006.lua

@@ -36,6 +36,9 @@ function c12812006.initial_effect(c)
 	local e4=e3:Clone()
 	e4:SetCode(EVENT_SPSUMMON_SUCCESS)
 	c:RegisterEffect(e4)
+
+	--
+	cm.self_summon_effect=e3
 end
 function cm.psplimit(e,c,tp,sumtp,sumpos)
 	return not c:IsSetCard(0xa73) and bit.band(sumtp,SUMMON_TYPE_PENDULUM)==SUMMON_TYPE_PENDULUM

expansions/script/c12812010.lua

@@ -38,7 +38,6 @@ function c12812010.initial_effect(c)
 	e4:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
 	e4:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e4:SetRange(LOCATION_MZONE)
-	e4:SetCountLimit(1,m)
 	e4:SetTarget(cm.tntg)
 	e4:SetOperation(cm.tnop)
 	c:RegisterEffect(e4)

expansions/script/c16104212.lua

@@ -14,6 +14,7 @@ function cm.thfilter(c)
 end
 function cm.thop(e,tp)
 	if rsop.SelectToHand(tp,aux.NecroValleyFilter(cm.thfilter),tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil,{}) then
+		Duel.BreakEffect()
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_FIELD)
 		e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)

expansions/script/c33400301.lua

@@ -33,7 +33,8 @@ function c33400301.spfilter(c,e,tp)
 end
 function c33400301.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:GetControler()==tp and c33400301.spfilter(chkc,e,tp) end
-	if chk==0 then return Duel.IsExistingTarget(c33400301.spfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end  
+	if chk==0 then return Duel.IsExistingMatchingCard(c33400301.spfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end  
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE)
 end
 function c33400301.spop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.IsExistingTarget(c33400301.spfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp) then return end

expansions/script/c33400330.lua

@@ -116,7 +116,7 @@ function cm.thfilter2(c)
 	return (c:IsSetCard(0x9340) or c:IsCode(33400350)) and c:IsAbleToHand()
 end
 function cm.thtg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,e:GetHandler()) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE)
 end
 function cm.thop2(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c33400331.lua

@@ -113,7 +113,7 @@ function cm.thfilter2(c)
 	return (c:IsSetCard(0x9340) or c:IsCode(33400450)) and c:IsAbleToHand()
 end
 function cm.thtg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,e:GetHandler()) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE)
 end
 function cm.thop2(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c33400332.lua

@@ -131,7 +131,7 @@ function cm.thfilter2(c)
 	return (c:IsSetCard(0x9340) or c:IsCode(33400200)) and c:IsAbleToHand()
 end
 function cm.thtg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,e:GetHandler()) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE)
 end
 function cm.thop2(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c33400333.lua

@@ -105,7 +105,7 @@ function cm.thfilter2(c)
 	return (c:IsSetCard(0x9340) or c:IsCode(33400113)) and c:IsAbleToHand()
 end
 function cm.thtg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,e:GetHandler()) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE)
 end
 function cm.thop2(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c33400334.lua

@@ -104,7 +104,7 @@ function cm.thfilter2(c)
 	return (c:IsSetCard(0x9340) or c:IsCode(33400502)) and c:IsAbleToHand()
 end
 function cm.thtg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,e:GetHandler()) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE)
 end
 function cm.thop2(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c33400335.lua

@@ -110,7 +110,7 @@ function cm.thfilter2(c)
 	return (c:IsSetCard(0x9340) or c:IsCode(33401050)) and c:IsAbleToHand()
 end
 function cm.thtg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,e:GetHandler()) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE)
 end
 function cm.thop2(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c33400336.lua

@@ -108,7 +108,7 @@ function cm.thfilter2(c)
 	return (c:IsSetCard(0x9340) or c:IsCode(33400651)) and c:IsAbleToHand()
 end
 function cm.thtg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,e:GetHandler()) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE)
 end
 function cm.thop2(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c33400337.lua

@@ -113,7 +113,7 @@ function cm.thfilter2(c)
 	return (c:IsSetCard(0x9340) or c:IsCode(33400751)) and c:IsAbleToHand()
 end
 function cm.thtg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,e:GetHandler()) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE)
 end
 function cm.thop2(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c33400338.lua

@@ -86,7 +86,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	  local tc=g1:GetFirst()
 	  if g1:GetCount()>0 then
 	  Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
-	  end	 
+	  end	
 		local cg=tc:GetColumnGroup():Filter(Card.IsAbleToHand,nil)   
 		cg:AddCard(tc) 
 		if cg:GetCount()>0 and  Duel.SelectYesNo(tp,aux.Stringid(m,0)) then 
@@ -113,7 +113,7 @@ function cm.thfilter2(c)
 	return (c:IsSetCard(0x9340) or c:IsCode(33400850,33400851)) and c:IsAbleToHand()
 end
 function cm.thtg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,e:GetHandler()) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE)
 end
 function cm.thop2(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c33400339.lua

@@ -115,7 +115,7 @@ function cm.thfilter2(c)
 	return (c:IsSetCard(0x9340) or c:IsCode(33400951)) and c:IsAbleToHand()
 end
 function cm.thtg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,e:GetHandler()) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK+LOCATION_GRAVE)
 end
 function cm.thop2(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c60150507.lua

@@ -36,7 +36,7 @@ function c60150507.initial_effect(c)
 	Duel.AddCustomActivityCounter(60150507,ACTIVITY_SPSUMMON,c60150507.counterfilter)
 end
 function c60150507.counterfilter(c)
-	return c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsRace(RACE_FIEND)
+	return not (c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsRace(RACE_FIEND))
 end
 function c60150507.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetCustomActivityCount(60150507,tp,ACTIVITY_SPSUMMON)==0 end

expansions/script/c60150541.lua

 --幻想曲的回转乐章
 function c60150541.initial_effect(c)
 	--xyz summon
-    aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0xab20),10,2)
-    c:EnableReviveLimit()
+	aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0xab20),10,2)
+	c:EnableReviveLimit()
 	--to hand
-    local e2=Effect.CreateEffect(c)
-    e2:SetDescription(aux.Stringid(60150541,0))
-    e2:SetCategory(CATEGORY_TOHAND)
-    e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
-    e2:SetType(EFFECT_TYPE_IGNITION)
-    e2:SetRange(LOCATION_MZONE)
-    e2:SetCountLimit(1)
-    e2:SetTarget(c60150541.thtg)
-    e2:SetOperation(c60150541.thop)
-    c:RegisterEffect(e2)
+	local e2=Effect.CreateEffect(c)
+	e2:SetDescription(aux.Stringid(60150541,0))
+	e2:SetCategory(CATEGORY_TOHAND)
+	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
+	e2:SetType(EFFECT_TYPE_IGNITION)
+	e2:SetRange(LOCATION_MZONE)
+	e2:SetCountLimit(1)
+	e2:SetTarget(c60150541.thtg)
+	e2:SetOperation(c60150541.thop)
+	c:RegisterEffect(e2)
 	--spsummon
-    local e1=Effect.CreateEffect(c)
-    e1:SetDescription(aux.Stringid(60150541,1))
-    e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
-    e1:SetType(EFFECT_TYPE_IGNITION)
-    e1:SetRange(LOCATION_MZONE)
-    e1:SetCountLimit(1,60150541)
-    e1:SetCost(c60150541.spcost)
-    e1:SetTarget(c60150541.sptg)
-    e1:SetOperation(c60150541.spop)
-    c:RegisterEffect(e1)
+	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(60150541,1))
+	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e1:SetType(EFFECT_TYPE_IGNITION)
+	e1:SetRange(LOCATION_MZONE)
+	e1:SetCountLimit(1,60150541)
+	e1:SetCost(c60150541.spcost)
+	e1:SetTarget(c60150541.sptg)
+	e1:SetOperation(c60150541.spop)
+	c:RegisterEffect(e1)
 end
 function c60150541.thfilter(c)
-    return c:IsType(TYPE_MONSTER) and c:IsRace(RACE_FIEND) and c:IsAttribute(ATTRIBUTE_LIGHT)
+	return c:IsType(TYPE_MONSTER) and c:IsRace(RACE_FIEND) and c:IsAttribute(ATTRIBUTE_LIGHT)
 		and c:IsFaceup() and c:IsAbleToHand()
 end
 function c60150541.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-    if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) and c60150541.thfilter(chkc) end
-    if chk==0 then return Duel.IsExistingTarget(c60150541.thfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil) end
-    Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
-    local g=Duel.SelectTarget(tp,c60150541.thfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil)
-    Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)
+	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) and c60150541.thfilter(chkc) end
+	if chk==0 then return Duel.IsExistingTarget(c60150541.thfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
+	local g=Duel.SelectTarget(tp,c60150541.thfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil)
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)
 end
 function c60150541.thop(e,tp,eg,ep,ev,re,r,rp)
-    local tc=Duel.GetFirstTarget()
-    if tc:IsRelateToEffect(e) and Duel.SendtoHand(tc,nil,REASON_EFFECT)>0 and tc:IsLocation(LOCATION_HAND) then
+	local tc=Duel.GetFirstTarget()
+	if tc:IsRelateToEffect(e) and Duel.SendtoHand(tc,nil,REASON_EFFECT)>0 and tc:IsLocation(LOCATION_HAND) then
 		if e:GetHandler():GetOverlayCount()==0 then
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
 			local g=Duel.GetFieldGroup(tp,LOCATION_HAND,0):Select(tp,1,1,nil)
 			Duel.SendtoDeck(g,nil,2,REASON_EFFECT)
 		end
-    end
+	end
 end
 function c60150541.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
-    local c=e:GetHandler()
-    if chk==0 then return c:CheckRemoveOverlayCard(tp,2,REASON_COST) and c:GetFlagEffect(60150541)==0 end
-    c:RemoveOverlayCard(tp,2,2,REASON_COST)
-    c:RegisterFlagEffect(60150541,RESET_CHAIN,0,1)
+	local c=e:GetHandler()
+	if chk==0 then return c:CheckRemoveOverlayCard(tp,2,REASON_COST) and c:GetFlagEffect(60150541)==0 end
+	c:RemoveOverlayCard(tp,2,2,REASON_COST)
+	c:RegisterFlagEffect(60150541,RESET_CHAIN,0,1)
 end
 function c60150541.filter(c,e,tp)
-    return c:GetRank()==10 and (c:IsSetCard(0xab20) or c:IsSetCard(0xcb20)) and e:GetHandler():IsCanBeXyzMaterial(c)
-        and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false)
+	return c:GetRank()==10 and (c:IsSetCard(0xab20) or c:IsSetCard(0xcb20)) and e:GetHandler():IsCanBeXyzMaterial(c)
+		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false)
 end
 function c60150541.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-    if chk==0 then return Duel.GetLocationCountFromEx(tp,tp,e:GetHandler())>0
-        and Duel.IsExistingMatchingCard(c60150541.filter,tp,LOCATION_EXTRA,0,1,nil,e,tp) end
-    Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
+	if chk==0 then return Duel.GetLocationCountFromEx(tp,tp,e:GetHandler())>-1
+		and Duel.IsExistingMatchingCard(c60150541.filter,tp,LOCATION_EXTRA,0,1,nil,e,tp) end
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
 function c60150541.spop(e,tp,eg,ep,ev,re,r,rp)
-    local c=e:GetHandler()
-    if Duel.GetLocationCountFromEx(tp,tp,c)<=0 then return end
-    if c:IsFacedown() or not c:IsRelateToEffect(e) or c:IsControler(1-tp) or c:IsImmuneToEffect(e) then return end
-    Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-    local g=Duel.SelectMatchingCard(tp,c60150541.filter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp,c:GetRank())
-    local sc=g:GetFirst()
-    if sc then
-        local mg=c:GetOverlayGroup()
-        if mg:GetCount()~=0 then
-            Duel.Overlay(sc,mg)
-        end
-        sc:SetMaterial(Group.FromCards(c))
-        Duel.Overlay(sc,Group.FromCards(c))
-        Duel.SpecialSummon(sc,SUMMON_TYPE_XYZ,tp,tp,false,false,POS_FACEUP)
-        sc:CompleteProcedure()
+	local c=e:GetHandler()
+	if Duel.GetLocationCountFromEx(tp,tp,c)<=0 then return end
+	if c:IsFacedown() or not c:IsRelateToEffect(e) or c:IsControler(1-tp) or c:IsImmuneToEffect(e) then return end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+	local g=Duel.SelectMatchingCard(tp,c60150541.filter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp,c:GetRank())
+	local sc=g:GetFirst()
+	if sc then
+		local mg=c:GetOverlayGroup()
+		if mg:GetCount()~=0 then
+			Duel.Overlay(sc,mg)
+		end
+		sc:SetMaterial(Group.FromCards(c))
+		Duel.Overlay(sc,Group.FromCards(c))
+		Duel.SpecialSummon(sc,SUMMON_TYPE_XYZ,tp,tp,false,false,POS_FACEUP)
+		sc:CompleteProcedure()
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetDescription(aux.Stringid(60150541,2))
-        e1:SetType(EFFECT_TYPE_SINGLE)
-        e1:SetCode(EFFECT_CANNOT_TRIGGER)
+		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetCode(EFFECT_CANNOT_TRIGGER)
 		e1:SetProperty(EFFECT_FLAG_CLIENT_HINT)
-        e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
-        sc:RegisterEffect(e1)
-    end
+		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
+		sc:RegisterEffect(e1)
+	end
 end

expansions/script/c71401007.lua

@@ -70,11 +70,13 @@ function c71401007.op2(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Remove(g,POS_FACEUP,REASON_EFFECT)
 	Duel.ShuffleDeck(tp)
 	Duel.BreakEffect()
-	local sg=Duel.GetMatchingGroup(c71401007.filter2,tp,LOCATION_HAND,0,nil,e,tp)
-	if Duel.Draw(tp,g:GetCount(),REASON_EFFECT)>0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and sg:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(71401007,2)) then
-		Duel.BreakEffect()
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-		local tg=sg:Select(tp,1,1,nil)
-		Duel.SpecialSummon(tg,0,tp,tp,false,false,POS_FACEUP)
+	if Duel.Draw(tp,g:GetCount(),REASON_EFFECT)>0 then
+		local sg=Duel.GetMatchingGroup(c71401007.filter2,tp,LOCATION_HAND,0,nil,e,tp)
+		if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and sg:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(71401007,2)) then
+			Duel.BreakEffect()
+			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+			local tg=sg:Select(tp,1,1,nil)
+			Duel.SpecialSummon(tg,0,tp,tp,false,false,POS_FACEUP)
+		end
 	end
 end
\ No newline at end of file

expansions/script/c88178002.lua

 --地灵殿
 function c88178002.initial_effect(c)
+	aux.AddCodeList(c,88178003)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
@@ -26,16 +27,16 @@ function c88178002.initial_effect(c)
 	e3:SetCondition(c88178002.spcon)
 	e3:SetTarget(c88178002.sumlimit)
 	c:RegisterEffect(e3)
-	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(88178002,1))
-	e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
-	e2:SetType(EFFECT_TYPE_IGNITION)
-	e2:SetRange(LOCATION_GRAVE)
-	e2:SetCountLimit(1,98178002)
-	e2:SetCost(aux.bfgcost)
-	e2:SetTarget(c88178002.thtg)
-	e2:SetOperation(c88178002.thop)
-	c:RegisterEffect(e2)
+	local e4=Effect.CreateEffect(c)
+	e4:SetDescription(aux.Stringid(88178002,1))
+	e4:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	e4:SetType(EFFECT_TYPE_IGNITION)
+	e4:SetRange(LOCATION_GRAVE)
+	e4:SetCountLimit(1,98178002)
+	e4:SetCost(aux.bfgcost)
+	e4:SetTarget(c88178002.thtg)
+	e4:SetOperation(c88178002.thop)
+	c:RegisterEffect(e4)
 end
 function c88178002.filter(c)
 	return c:IsSetCard(0x3591) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()

expansions/script/c88178003.lua

@@ -18,7 +18,7 @@ function c88178003.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c88178003.filter(c)
-	return c:IsCode(88178002) and c:IsAbleToHand()
+	return (c:IsCode(88178002) or c:IsCode(88178508)) and c:IsAbleToHand()
 end
 function c88178003.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c88178003.filter,tp,LOCATION_DECK,0,1,nil) end
@@ -34,7 +34,7 @@ function c88178003.activate(e,tp,eg,ep,ev,re,r,rp)
 end
 function c88178003.repfilter(c,tp)
 	return c:IsFaceup() and c:IsControler(tp) and c:IsLocation(LOCATION_ONFIELD)
-		and c:IsSetCard(0x3591) and c:IsReason(REASON_BATTLE+REASON_EFFECT) and not c:IsReason(REASON_REPLACE)
+		and (c:IsSetCard(0x3591) or c:IsSetCard(0x3597)) and c:IsReason(REASON_BATTLE+REASON_EFFECT) and not c:IsReason(REASON_REPLACE)
 end
 function c88178003.reptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()

expansions/script/c88178101.lua

 --红魔馆
 function c88178101.initial_effect(c)
+	aux.AddCodeList(c,88178102)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)

expansions/script/c88178113.lua

 --完美潇洒的女仆 十六夜咲夜
 function c88178113.initial_effect(c)
-	c:EnableCounterPermit(0x593)
+	c:EnableCounterPermit(0x0593)
 	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x3593),aux.NonTuner(Card.IsSetCard,0x3593),1)
 	c:EnableReviveLimit()
 	c:SetUniqueOnField(1,0,88178113)
@@ -67,13 +67,13 @@ function c88178113.atkop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetValue(atkval)
 	c:RegisterEffect(e1,true)
 	local ct=Duel.GetMatchingGroupCount(c88178113.cfilter1,tp,LOCATION_ONFIELD+LOCATION_GRAVE,0,nil)
-	if c:IsRelateToEffect(e) and ct>0 and c:IsCanAddCounter(0x593,ct) then
-		c:AddCounter(0x593,ct)
+	if c:IsRelateToEffect(e) and ct>0 and c:IsCanAddCounter(0x0593,ct) then
+		c:AddCounter(0x0593,ct)
 	end
 end
 function c88178113.setcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsCanRemoveCounter(tp,1,0,0x593,2,REASON_COST) end
-	Duel.RemoveCounter(tp,1,0,0x593,2,REASON_COST)
+	if chk==0 then return Duel.IsCanRemoveCounter(tp,1,0,0x0593,2,REASON_COST) end
+	Duel.RemoveCounter(tp,1,0,0x0593,2,REASON_COST)
 end
 function c88178113.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local g=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)

expansions/script/c88178201.lua

 --雾之湖
 function c88178201.initial_effect(c)
+	aux.AddCodeList(c,88178102)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)