fix

expansions/script/c11600515.lua

@@ -91,7 +91,7 @@ function c11600515.rtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local mg=Duel.GetRitualMaterial(tp)
 	if chk==0 then   
 		return c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_RITUAL,tp,false,true) 
-		and mg:CheckWithSumGreater(Card.GetRitualLevel,8,c)
+		and mg:CheckWithSumEqual(Card.GetRitualLevel,8,1,8,c)
 	end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_SZONE)
 end
@@ -103,6 +103,7 @@ function c11600515.rop(e,tp,eg,ep,ev,re,r,rp)
 	aux.GCheckAdditional=aux.RitualCheckAdditional(c,8,"Equal")
 	local mat=mg:SelectSubGroup(tp,aux.RitualCheck,false,1,8,tp,c,8,"Equal")
 	aux.GCheckAdditional=nil
+	if not mat or #mat<1 then return end
 	c:SetMaterial(mat)
 	Duel.ReleaseRitualMaterial(mat)
 	Duel.BreakEffect()

expansions/script/c12400123.lua

@@ -18,7 +18,7 @@ function s.initial_effect(c)
 	--link as level
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	--e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e2:SetCode(EFFECT_ALLOW_SYNCHRO_KOISHI)
 	e2:SetValue(function(e,c)
 		return e:GetHandler():GetLink()

expansions/script/c12869025.lua

@@ -13,7 +13,7 @@ function c12869025.initial_effect(c)
 	--link as level
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	--e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e2:SetCode(EFFECT_ALLOW_SYNCHRO_KOISHI)
 	e2:SetValue(function(e,c)
 		return e:GetHandler():GetLink()

expansions/script/c12869030.lua

@@ -12,7 +12,7 @@ function c12869030.initial_effect(c)
 	--link as level
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	--e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e2:SetCode(EFFECT_ALLOW_SYNCHRO_KOISHI)
 	e2:SetValue(function(e,c)
 		return e:GetHandler():GetLink()

expansions/script/c12869035.lua

@@ -12,7 +12,7 @@ function c12869035.initial_effect(c)
 	--link as level
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	--e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e2:SetCode(EFFECT_ALLOW_SYNCHRO_KOISHI)
 	e2:SetValue(function(e,c)
 		return e:GetHandler():GetLink()

expansions/script/c12869040.lua

@@ -12,7 +12,7 @@ function c12869040.initial_effect(c)
 	--link as level
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	--e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e2:SetCode(EFFECT_ALLOW_SYNCHRO_KOISHI)
 	e2:SetValue(function(e,c)
 		return e:GetHandler():GetLink()

expansions/script/c12869065.lua

@@ -99,9 +99,11 @@ end
 function s.settg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then return c:IsSSetable() end
-	Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,c,1,0,0)
+	if c:IsLocation(LOCATION_GRAVE) then
+		Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,c,1,0,0)
+	end
 end
 function s.setop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then Duel.SSet(tp,c) end
+	if c:IsRelateToEffect(e) and aux.NecroValleyFilter()(c) then Duel.SSet(tp,c) end
 end
\ No newline at end of file

expansions/script/c12869070.lua

@@ -90,11 +90,13 @@ end
 function s.settg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then return c:IsSSetable() end
-	Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,c,1,0,0)
+	if c:IsLocation(LOCATION_GRAVE) then
+		Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,c,1,0,0)
+	end
 end
 function s.setop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then Duel.SSet(tp,c) end
+	if c:IsRelateToEffect(e) and aux.NecroValleyFilter()(c) then Duel.SSet(tp,c) end
 	local e1=Effect.CreateEffect(c)
 		e1:SetDescription(aux.Stringid(id,4))
 		e1:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c12869075.lua

@@ -154,11 +154,13 @@ end
 function s.settg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then return c:IsSSetable() end
-	Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,c,1,0,0)
+	if c:IsLocation(LOCATION_GRAVE) then
+		Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,c,1,0,0)
+	end
 end
 function s.setop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then Duel.SSet(tp,c) end
+	if c:IsRelateToEffect(e) and aux.NecroValleyFilter()(c) then Duel.SSet(tp,c) end
 	local e1=Effect.CreateEffect(c)
 		e1:SetDescription(aux.Stringid(id,4))
 		e1:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c12869080.lua

@@ -65,11 +65,13 @@ end
 function s.settg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then return c:IsSSetable() end
-	Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,c,1,0,0)
+	if c:IsLocation(LOCATION_GRAVE) then
+		Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,c,1,0,0)
+	end
 end
 function s.setop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then Duel.SSet(tp,c) end
+	if c:IsRelateToEffect(e) and aux.NecroValleyFilter()(c) then Duel.SSet(tp,c) end
 	local e1=Effect.CreateEffect(c)
 		e1:SetDescription(aux.Stringid(id,4))
 		e1:SetType(EFFECT_TYPE_SINGLE)

expansions/script/c60001172.lua

@@ -27,13 +27,23 @@ function c60001172.initial_effect(c)
 	e3:SetRange(LOCATION_REMOVED)
 	c:RegisterEffect(e3)
 
+	--修改全局检查效果
 	if not c60001172.global_check then
 		c60001172.global_check=true
-		local e4=Effect.CreateEffect(c)
-		e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
+		local e4=Effect.GlobalEffect()
+		e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 		e4:SetCode(EVENT_SSET)
-		e4:SetCondition(c60001172.setcon)
-		e4:SetOperation(c60001172.setop)
+		e4:SetOperation(function(e,tp,eg,ep,ev,re,r,rp)
+			local tg=eg:Filter(function(c)
+				return c:IsCode(60001172) and c:IsType(TYPE_SPELL+TYPE_TRAP)
+			end,nil)
+			if tg:GetCount()<=0 then return end
+			local tc=tg:GetFirst()
+			while tc do
+				tc:RegisterFlagEffect(60001168,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
+				tc=tg:GetNext()
+			end
+		end)
 		Duel.RegisterEffect(e4,0)
 	end
 end
@@ -45,12 +55,17 @@ function c60001172.setcon(e,tp,eg,ep,ev,re,r,rp)
 end
 function c60001172.setop(e,tp,eg,ep,ev,re,r,rp)
 	local tg=eg:Filter(c60001172.setter,nil)
-	for tc in aux.Next(tg) do
+	if tg:GetCount()<=0 then return end
+	local tc=tg:GetFirst()
+	while tc do
 		tc:RegisterFlagEffect(60001168,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
+		tc=tg:GetNext()
 	end
 end
 function c60001172.fscon(e,tp,eg,ep,ev,re,r,rp)
-	return rp==1-tp and re:IsHasCategory(CATEGORY_SPECIAL_SUMMON)
+    --原代码只检查特殊召唤效果，需要加入类型判定
+    return rp==1-tp and re:IsHasCategory(CATEGORY_SPECIAL_SUMMON) 
+        and (re:IsActiveType(TYPE_SPELL+TYPE_TRAP) or re:IsActiveType(TYPE_MONSTER))
 end
 function c60001172.cwter(c)
 	return c:IsSummonType(SUMMON_TYPE_SPECIAL)
@@ -61,17 +76,18 @@ function c60001172.fstg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local g=Duel.GetMatchingGroup(c60001172.cwter,tp,0,LOCATION_MZONE,nil)
 end
 function c60001172.fsop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local a1,a2,a3,a4,zone=Duel.GetOperationInfo()
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
-	e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
-	e1:SetReset(RESET_PHASE+PHASE_END)
-	e1:SetTargetRange(1,0)
-	e1:SetLabel(zone)
-	e1:SetTarget(c60001172.splimit)
-	Duel.RegisterEffect(e1,1-tp)
+    local c=e:GetHandler()
+    --修改这一行
+    local loc=re:GetHandler():GetLocation()
+    local e1=Effect.CreateEffect(c)
+    e1:SetType(EFFECT_TYPE_FIELD)
+    e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH)
+    e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
+    e1:SetReset(RESET_PHASE+PHASE_END)
+    e1:SetTargetRange(1,0)
+    e1:SetLabel(loc)    --使用获取到的位置
+    e1:SetTarget(c60001172.splimit)
+    Duel.RegisterEffect(e1,1-tp)
 	local g=Duel.GetMatchingGroup(c60001172.cwter,tp,0,LOCATION_MZONE,nil)
 	if c:GetFlagEffect(60001168)>0 and c:IsLocation(LOCATION_SZONE) and #g>0 and Duel.SelectYesNo(tp,aux.Stringid(60001172,2)) then
 		Duel.Remove(g,POS_FACEUP,REASON_EFFECT)
@@ -85,12 +101,11 @@ function c60001172.fsop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e4,1-tp)
 end
 function c60001172.ntop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	Duel.Recover(tp,2000,REASON_EFFECT)
-	e:Reset()
+    Duel.Recover(tp,2000,REASON_EFFECT)
+    e:Reset()
 end
-function c60001172.splimit(e,c)
-	return c:IsLocation(zone)
+function c60001172.splimit(e,c,sump,sumtype,sumpos,targetp,se)
+    return c:IsLocation(e:GetLabel())
 end
 function c60001172.filter2(c)
 	return aux.IsCodeListed(c,60001179) and c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsSSetable()

expansions/script/c60159912.lua

@@ -11,7 +11,7 @@ function c60159912.initial_effect(c)
 	--act in hand
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetCode(EFFECT_TRAP_ACT_IN_HAND)
+	e2:SetCode(EFFECT_QP_ACT_IN_NTPHAND)
 	e2:SetCondition(c60159912.handcon)
 	c:RegisterEffect(e2)
 end
@@ -33,5 +33,5 @@ function c60159912.chainop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.SetChainLimit(aux.FALSE)
 end
 function c60159912.handcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetCurrentChain()>1
+	return Duel.GetCurrentChain()>2
 end
\ No newline at end of file

expansions/script/c62625125.lua

@@ -104,12 +104,19 @@ function c62625125.target(e,tp,eg,ep,ev,re,r,rp,chk)
 		{b1,aux.Stringid(62625125,1)},
 		{b2,aux.Stringid(62625125,2)})
 	e:SetLabel(op)
+	if op==1 then
+		Duel.SetTargetPlayer(tp)
+		Duel.SetTargetParam(2)
+		Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,2)
+		Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,0,tp,LOCATION_HAND)
+	end
 end
 function c62625125.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local op=e:GetLabel()
 	if op==1 then
-		if Duel.Draw(tp,2,REASON_EFFECT)==2 then
+		local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
+		if Duel.Draw(p,d,REASON_EFFECT)==2 then
 			Duel.ShuffleHand(p)
 			Duel.Hint(HINT_SELECTMSG,p,HINTMSG_TODECK)
 			local sg=Duel.SelectMatchingCard(p,Card.IsAbleToDeck,p,LOCATION_HAND,0,1,1,nil)