fix

expansions/script/c12045000.lua

@@ -20,15 +20,20 @@ function cm.initial_effect(c)
 	--CANNOT_DISCARD_DECK
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-	e2:SetCode(EFFECT_CANNOT_DISCARD_DECK)
+	e2:SetCode(EFFECT_CANNOT_TO_GRAVE)
 	e2:SetRange(LOCATION_FZONE)
-	e2:SetTargetRange(1,1)
+	e2:SetTargetRange(LOCATION_DECK,LOCATION_DECK)
 	c:RegisterEffect(e2)
+	local e2_1=Effect.CreateEffect(c)
+	e2_1:SetType(EFFECT_TYPE_FIELD)
+	e2_1:SetCode(EFFECT_CANNOT_DISCARD_DECK)
+	e2_1:SetRange(LOCATION_FZONE)
+	e2_1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e2_1:SetTargetRange(1,1)
+	c:RegisterEffect(e2_1)
 	--CANNOT_REMOVE
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e2:SetCode(EFFECT_CANNOT_REMOVE)
 	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_DECK,LOCATION_DECK)

expansions/script/c12062010.lua

@@ -91,7 +91,7 @@ function cm.operation1(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SELF)
 	local g=Duel.SelectMatchingCard(tp,cm.f1,tp,LOCATION_HAND,0,1,63,nil)
 	local sg=g:Filter(Card.IsRelateToEffect,nil,e)
-	local ct=Duel.SendtoDeck(g,nil,0,REASON_EFFECT)
+	local ct=Duel.SendtoDeck(g,nil,0,REASON_EFFECT)+1
 	if ct>0 then
 		Duel.ShuffleDeck(tp)
 		Duel.BreakEffect()

expansions/script/c12066024.lua

@@ -22,15 +22,20 @@ function cm.initial_effect(c)
 	--CANNOT_DISCARD_DECK
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-	e2:SetCode(EFFECT_CANNOT_DISCARD_DECK)
+	e2:SetCode(EFFECT_CANNOT_TO_GRAVE)
 	e2:SetRange(LOCATION_FZONE)
-	e2:SetTargetRange(1,1)
+	e2:SetTargetRange(LOCATION_DECK,LOCATION_DECK)
 	c:RegisterEffect(e2)
+	local e2_1=Effect.CreateEffect(c)
+	e2_1:SetType(EFFECT_TYPE_FIELD)
+	e2_1:SetCode(EFFECT_CANNOT_DISCARD_DECK)
+	e2_1:SetRange(LOCATION_FZONE)
+	e2_1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+	e2_1:SetTargetRange(1,1)
+	c:RegisterEffect(e2_1)
 	--CANNOT_REMOVE
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e2:SetCode(EFFECT_CANNOT_REMOVE)
 	e2:SetRange(LOCATION_FZONE)
 	e2:SetTargetRange(LOCATION_DECK,LOCATION_DECK)

expansions/script/c60010235.lua

@@ -49,7 +49,7 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
-	if tc:IsRelateToEffect(e) and aux.NecroValleyFilter()(tc) then
+	if tc:IsRelateToEffect(e) and aux.NecroValleyFilter(tc) then
 		Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
 	end
 end

expansions/script/c61200000.lua

@@ -4,7 +4,7 @@ function c61200000.initial_effect(c)
 	aux.AddCodeList(c,61200310,61200101)
 	--仪式召唤
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TODECK+CATEGORY_TOGRAVE)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetCountLimit(1,id)
@@ -31,7 +31,7 @@ end
 function s.f2(c,e,tp)
 	return c:IsCode(61200310)
 	and (c:IsLocation(LOCATION_HAND) or (c:IsLocation(LOCATION_REMOVED) and c:IsFaceup()))
-	and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_RITUAL,tp,false,false)
+	and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_RITUAL,tp,false,true)
 end
 
 function s.f3(c)
@@ -39,8 +39,7 @@ function s.f3(c)
 	and c:IsLevelAbove(0)
 	and c:IsAbleToGraveAsCost()
 	and c:IsType(TYPE_MONSTER)
-	and not c:IsCode(61200310)
-	and not c:IsCode(61200101)
+	and not c:IsCode(61200310,61200101)
 end
 
 function s.f4(c,e,tp)
@@ -57,17 +56,12 @@ function s.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	local g3=Duel.GetMatchingGroup(s.f3,tp,LOCATION_HAND+LOCATION_ONFIELD+LOCATION_REMOVED,0,nil)
 	local l=0
 	if g3:GetCount()>0 then
-	    local sg3=g3:GetFirst()
-        while sg3 do
-			l=l+sg3:GetLevel()
-			sg3=g3:GetNext()
-		end
+	    l=g3:GetSum(Card.GetLevel)
 	end
 	if chk==0 then
 		return g1:GetCount()>0
 		and g2:GetCount()>0
 		and l>=3
-		and Duel.GetLocationCount()>0
 	end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,0)
 end
@@ -77,31 +71,37 @@ function s.op1(e,tp,eg,ep,ev,re,r,rp)
 	local g2=Duel.GetMatchingGroup(s.f2,tp,LOCATION_HAND+LOCATION_REMOVED,0,nil,e,tp)
 	local g3=Duel.GetMatchingGroup(s.f3,tp,LOCATION_HAND+LOCATION_ONFIELD+LOCATION_REMOVED,0,nil)
 	local l=0
-	local sjg=Group.CreateGroup()
 	local jg=Group.CreateGroup()
+	local a=0
     if g1:GetCount()>0 then
 		Duel.SendtoDeck(g1,nil,2,REASON_EFFECT)
 	    if g3:GetCount()>0 then
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-			while l<3 and g3:GetCount()>0 do
-			    sjg=g3:Select(tp,1,1,nil)
-                local sg=sjg:GetFirst()
-		    	l=l+sg:GetLevel()
+			while g3:GetCount()>0 and a==0 do
+			    local sjg=g3:SelectUnselect(jg,tp,true,false)
+		    	l=l+sjg:GetLevel()
 				g3:RemoveCard(sjg)
-				jg:AddCard(sjg)
+				if l>=3 then
+					a=1
+				end
 			end
             if g3:GetCount()>0 and l>=3 and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
 				Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-				sjg=g3:Select(tp,1,999,nil)
-				jg:Merge(sjg)
+				jg:Merge(g3:Select(tp,1,999,nil))
 			end
-			Duel.SendtoGrave(jg,REASON_EFFECT)
-		    if jg:GetCount()>0 and jg:GetSum(Card.GetLevel)>=3 then
-			    local sg2=g2:Select(tp,1,1,nil)
-		        local fg2=sg2:GetFirst()
-			    Duel.SpecialSummon(fg2,SUMMON_TYPE_RITUAL,tp,tp,false,false,POS_FACEUP)
-			    fg2:CompleteProcedure()
-			    fg2:SetMaterial(jg)
+			if l>=3 then
+				local g4=jg:Filter(Card.IsLocation,nil,LOCATION_REMOVED)
+				jg:Remove(Card.IsLocation,nil,LOCATION_REMOVED)
+			    Duel.SendtoGrave(jg,REASON_EFFECT)
+				Duel.SendtoGrave(g4,REASON_EFFECT+REASON_RETURN)
+				if g2:GetCount()>0 then
+					Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+					local sg2=g2:Select(tp,1,1,nil)
+					Duel.SpecialSummon(sg2,SUMMON_TYPE_RITUAL,tp,tp,false,true,POS_FACEUP)
+					local ssg2=sg2:GetFirst()
+					ssg2:SetMaterial(jg)
+					ssg2:CompleteProcedure()
+				end
 			end
 		end
 	end

expansions/script/c61200001.lua

@@ -46,7 +46,7 @@ function c61200001.initial_effect(c)
 end
 
 function s.f1(c)
-	return c:IsSetCard(0x3480) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
+	return c:IsSetCard(0x3480) and c:IsAbleToHand()
 end
 
 function s.f2(c)

expansions/script/c61200007.lua

@@ -3,6 +3,7 @@ local s,id,o=GetID()
 function c61200007.initial_effect(c)
 	--魔陷启动
 	local e0=Effect.CreateEffect(c)
+	e0:SetDescription(aux.Stringid(id,5))
 	e0:SetType(EFFECT_TYPE_SINGLE)
 	e0:SetValue(id)
 	e0:SetCode(EFFECT_TRAP_ACT_IN_SET_TURN)

expansions/script/c61200009.lua

@@ -85,7 +85,7 @@ end
 
 function s.con2(e,tp,eg,ep,ev,re,r,rp)
     local g=Duel.GetMatchingGroup(s.f2,tp,LOCATION_ONFIELD+LOCATION_GRAVE+LOCATION_REMOVED,0,nil)
-	return g:GetClassCount(Card.GetCode)>=4
+	return g:GetClassCount(Card.GetCode)>=4 and (re:IsActiveType(TYPE_SPELL) or re:IsActiveType(TYPE_TRAP))
 end
 
 function s.cost2(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c61200010.lua

@@ -52,11 +52,13 @@ function s.f5(c)
 end
 
 function s.f6(c)
-    return c:IsSetCard(0x3481) and c:IsAbleToHand() and c:IsFaceup()
+    return c:IsSetCard(0x3481)
+	and c:IsAbleToHand()
+	and ((c:IsFaceup() and c:IsLocation(LOCATION_REMOVED)) or c:IsLocation(LOCATION_DECK))
 end
 
 function s.con1(e)
-	return Duel.IsExistingMatchingCard(s.f1,tp,LOCATION_ONFIELD,0,1,nil)
+	return Duel.IsExistingMatchingCard(s.f1,tp,LOCATION_ONFIELD+LOCATION_REMOVED,0,1,nil)
 end
 
 function s.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -94,12 +96,12 @@ end
 function s.tg3(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.f6,tp,LOCATION_DECK+LOCATION_REMOVED,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_SEARCH,nil,1,tp,0)
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,0)
 end
 
 function s.op3(e,tp,eg,ep,ev,re,r,rp)
-	if not Duel.IsExistingMatchingCard(s.f6,tp,LOCATION_DECK+LOCATION_REMOVED,0,1,nil) then return end
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.SelectMatchingCard(tp,s.f6,tp,LOCATION_DECK+LOCATION_REMOVED,0,1,1,nil)
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	if g:GetCount()>0 then
         Duel.SendtoHand(g,tp,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)

expansions/script/c61200103.lua

@@ -45,12 +45,12 @@ function s.f2(c)
     return c:IsDiscardable()
 end
 
-function s.f3(c,e)
-    return c:IsSetCard(0x3480) and c:IsType(TYPE_SYNCHRO) and c:IsLevelAbove(7) and c:IsImmuneToEffect(e) and c:IsType(TYPE_MONSTER)
+function s.f3(c)
+    return c:IsSetCard(0x3480) and c:IsType(TYPE_MONSTER) and not c:IsType(TYPE_TUNER)
 end
 
-function s.f4(c,e)
-    return c:IsType(TYPE_SYNCHRO) and c:IsLevelAbove(7) and c:IsImmuneToEffect(e) and c:IsType(TYPE_MONSTER)
+function s.f4(c)
+    return c:IsType(TYPE_MONSTER) and not c:IsType(TYPE_TUNER)
 end
 
 function s.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -88,46 +88,40 @@ end
 function s.cost3(e,tp,eg,ep,ev,re,r,rp,chk)
     local c=e:GetHandler()
     local g=Duel.GetMatchingGroup(s.f2,tp,LOCATION_HAND,0,nil)
-	if chk==0 then return g:GetCount()>0 and c:IsAbleToGrave() end
-    if g:GetCount()>0 then
+	if chk==0 then return c:IsAbleToGrave() end
+    if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(id,4)) then
 	    Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISCARD)
-	    Duel.Discard(tp,s.f2,1,1,REASON_COST,nil)
-    end
-    Duel.SendtoGrave(c,REASON_COST)
-    eg:RemoveCard(c)
-    local ag=eg:GetFirst()
-    if eg:GetCount()>0 and ag:IsSetCard(0x3480) then
-        c:RegisterFlagEffect(id,RESET_CHAIN,0,0)
+	    Duel.DiscardHand(tp,s.f2,1,1,REASON_COST,nil)
+		e:SetLabel(1)
     end
+    Duel.SendtoGrave(c,REASON_COST+REASON_RETURN)
 end
 
 function s.tg3(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
-	local g1=Duel.GetMatchingGroup(s.f3,tp,LOCATION_ONFIELD,0,nil,e)
-	local g2=Duel.GetMatchingGroup(s.f4,tp,LOCATION_ONFIELD,0,nil,e)
-    local s=0
-	if c:GetFlagEffect(id)>0 then
-		if g2:GetCount()>0 then
-			s=1
+    local q=e:GetLabel()
+	if q==1 then
+		if Duel.IsExistingMatchingCard(s.f4,tp,LOCATION_MZONE,0,1,nil) then
+			q=2
 		end
 	else
-		if g1:GetCount()>0 then
-			s=1
+		if Duel.IsExistingMatchingCard(s.f3,tp,LOCATION_MZONE,0,1,nil) then
+			q=2
 		end
 	end
-	if chk==0 then return s==1 end
+	if chk==0 then return q==2 end
 end
 
 function s.op3(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
+	local s=e:GetLabel()
 	local g=Group.CreateGroup()
 	local g1=Duel.GetMatchingGroup(s.f3,tp,LOCATION_ONFIELD,0,nil,e)
 	local g2=Duel.GetMatchingGroup(s.f4,tp,LOCATION_ONFIELD,0,nil,e)
-	if c:GetFlagEffect(id)>0 then
-		Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(id,3))
+	Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(id,3))
+	if s==1 then
 		g=g2:Select(tp,1,1,nil)
 	else
-		Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(id,3))
 		g=g1:Select(tp,1,1,nil)
     end
 	if g:GetCount()>0 then

expansions/script/c61200106.lua

@@ -33,7 +33,7 @@ function c61200106.initial_effect(c)
     local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(id,2))
 	e3:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_FUSION_SUMMON+CATEGORY_TODECK)
-	e3:SetType(FFECT_TYPE_QUICK_O)
+	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetCode(EVENT_FREE_CHAIN)
 	e3:SetRange(LOCATION_ONFIELD)
 	e3:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_MAIN_END)

expansions/script/c61200110.lua

@@ -63,16 +63,15 @@ end
 function s.cost1(e,tp,eg,ep,ev,re,r,rp,chk)
     local c=e:GetHandler()
 	if chk==0 then return Duel.IsExistingMatchingCard(s.f1,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,c) end
-	local g=Duel.SelectMatchingCard(tp,s.f1,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,1,c)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
+	local g=Duel.SelectMatchingCard(tp,s.f1,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,1,c)
 	Duel.Remove(g,POS_FACEUP,REASON_COST)
 end
 
 function s.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
-		and Duel.IsExistingMatchingCard(s.f1,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,c) end
+		and c:IsCanBeSpecialSummoned(e,0,tp,false,false) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,0,0)
 end
 

expansions/script/c61200206.lua

@@ -118,7 +118,7 @@ function s.cost3(e,tp,eg,ep,ev,re,r,rp,chk)
 	if op==1 then
         local g=g1:Select(tp,1,1,nil)
 	elseif op==2 then
-        local g=Duel.Select(tp,2,2,nil)
+        local g=g2:Select(tp,2,2,nil)
     end
     Duel.SendtoGrave(c,REASON_COST)
     if g:GetCount()>0 then

expansions/script/c61200208.lua

@@ -33,10 +33,10 @@ function c61200208.initial_effect(c)
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(id,1))
 	e4:SetCategory(CATEGORY_DISABLE_SUMMON+CATEGORY_DESTROY)
-	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+	e4:SetType(EFFECT_TYPE_QUICK_O)
 	e4:SetCode(EVENT_SUMMON)
 	e4:SetCountLimit(1,id+o)
-	e4:SetCondition(aux.NegateSummonCondition)
+	e4:SetCondition(s.con4)
 	e4:SetCost(s.cost4)
 	e4:SetTarget(s.tg4)
 	e4:SetOperation(s.op4)
@@ -100,6 +100,10 @@ function s.op3(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 
+function s.con4(e,tp,eg,ep,ev,re,r,rp)
+	return ep==1-tp and Duel.GetCurrentChain()==0
+end
+
 function s.cost4(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	local ct=c:GetEquipTarget()
@@ -133,11 +137,16 @@ function s.op6(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetCode(EFFECT_CHANGE_DAMAGE)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e1:SetTargetRange(1,0)
-	e1:SetValue(0)
+	e1:SetValue(s.val6)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)
 	local e2=e1:Clone()
 	e2:SetCode(EFFECT_NO_EFFECT_DAMAGE)
 	e2:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e2,tp)
+end
+
+function s.val6(e,re,val,r,rp,rc)
+	if bit.band(r,REASON_EFFECT)~=0 then return 0
+	else return val end
 end
\ No newline at end of file

expansions/script/c61200209.lua

@@ -71,7 +71,7 @@ function s.f3(c,e,tp)
     return c:IsSetCard(0x3480)
     and c:IsType(TYPE_MONSTER)
     and (c:IsLocation(LOCATION_DECK) or (c:IsLocation(LOCATION_REMOVED) and c:IsFaceup()))
-    and c:IsCanBeSpecialSummoned(e,nil,tp,false,false)
+    and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 
 function s.f4(c)
@@ -139,7 +139,7 @@ function s.tg4(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 end
     
 function s.op4(e,tp,eg,ep,ev,re,r,rp)
-    local g=Duel.GetMatchingGroup(s.f3,tp,LOCATION_DECK+LOCATION_REMOVED,0,nil)
+    local g=Duel.GetMatchingGroup(s.f3,tp,LOCATION_DECK+LOCATION_REMOVED,0,nil,e,tp)
     local g1=Group.CreateGroup()
     Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
     if Duel.IsPlayerAffectedByEffect(tp,59822133) or g:GetCount()==1 then
@@ -170,6 +170,6 @@ function s.op5(e,tp,eg,ep,ev,re,r,rp)
     if g:GetCount()>0 then
         Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
         local sg=g:Select(tp,1,3,nil)
-        Duel.SendtoGrave(sg,REASON_EFFECT)
+        Duel.SendtoGrave(sg,REASON_EFFECT+REASON_RETURN)
     end
 end
\ No newline at end of file

expansions/script/c61200300.lua

@@ -143,7 +143,7 @@ function s.op4(e,tp,eg,ep,ev,re,r,rp)
 				if fg:CheckFusionMaterial(mg0,smg1,tp,false) then
 					mg2:AddCard(smg1)
 				end
-				smg1:GetNext()
+				smg1=mg1:GetNext()
 			end
 			if mg2:GetCount()>0 then
 				Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(id,3))

expansions/script/c61200301.lua

@@ -67,9 +67,7 @@ function s.op2(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function s.tg4(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then
-		return Duel.IsExistingMatchingCard(s.f3,tp,LOCATION_REMOVED,LOCATION_REMOVED,1,nil)
-	end
+	if chk==0 then return true end
 	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,nil,0,LOCATION_REMOVED)
 end
 
@@ -77,6 +75,6 @@ function s.op4(e,tp,eg,ep,ev,re,r,rp)
     local g=Duel.GetMatchingGroup(s.f3,tp,LOCATION_REMOVED,LOCATION_REMOVED,nil)
     if g:GetCount()>0 then
 	    Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-        Duel.SendtoGrave(g:Select(tp,1,2,nil),REASON_EFFECT)
+        Duel.SendtoGrave(g:Select(tp,1,2,nil),REASON_EFFECT+REASON_RETURN)
     end
 end
\ No newline at end of file

expansions/script/c61200302.lua

@@ -45,13 +45,14 @@ function c61200302.initial_effect(c)
 	e5:SetTarget(s.tg5)
 	e5:SetOperation(s.op5)
 	c:RegisterEffect(e5)
-	--除外效果
+	--进墓地效果
 	local e6=Effect.CreateEffect(c)
 	e6:SetCategory(CATEGORY_TOHAND)
 	e6:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e6:SetProperty(EFFECT_FLAG_DELAY)
-	e6:SetCode(EVENT_TO_GRAVE)
+	e6:SetCode(EVENT_RETURN_TO_GRAVE)
 	e6:SetCountLimit(1,id+o*2)
+	e6:SetCondition(s.con6)
 	e6:SetTarget(s.tg6)
 	e6:SetOperation(s.op6)
 	c:RegisterEffect(e6)

expansions/script/c61200306.lua

@@ -67,7 +67,7 @@ end
 
 function s.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() end
-	Duel.SendtoGrave(e:GetHandler(),REASON_COST)
+	Duel.SendtoGrave(e:GetHandler(),REASON_COST+REASON_RETURN)
 end
 
 function s.tg2(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c61200307.lua

@@ -113,12 +113,13 @@ function s.op3(e,tp,eg,ep,ev,re,r,rp)
     local tc=Duel.GetFirstTarget()
 	local g=Group.CreateGroup()
 	g:AddCard(c)
-	local g1=Duel.GetMatchingGroup(s.f1,tp,LOCATION_ONFIELD+LOCATION_REMOVED,0,c)
+	g:AddCard(tc)
+	local g1=Duel.GetMatchingGroup(s.f1,tp,LOCATION_ONFIELD+LOCATION_REMOVED,0,g)
 	if tc:IsRelateToEffect(e) and tc:IsFaceup() then
 		if g1:GetCount()>0 then
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
-			g:Merge(g1:Select(tp,1,1,nil))
-		    Duel.Overlay(g,tc)
+			Group.Merge(g,g1:Select(tp,1,1,nil))
+		    Duel.Overlay(tc,g)
 		    local e1=Effect.CreateEffect(c)
 	        e1:SetDescription(aux.Stringid(id,3))
 	        e1:SetType(EFFECT_TYPE_SINGLE)
@@ -148,6 +149,6 @@ function s.op5(e,tp,eg,ep,ev,re,r,rp)
     if g:GetCount()>=2 then
 	    Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 		local g1=g:Select(tp,2,2,nil)
-        Duel.SendtoGrave(g1,REASON_EFFECT)
+        Duel.SendtoGrave(g1,REASON_EFFECT+REASON_RETURN)
     end
 end
\ No newline at end of file

expansions/script/c61200310.lua

@@ -68,15 +68,15 @@ function s.f3(c,e,tp)
 end
 
 function s.f4(c)
-	return c:IsSetCard(0x3480) and (c:IsLocation(LOCATION_REMOVED) and c:IsFaceup())
+	return c:IsSetCard(0x3480) and c:IsFaceup()
 end
 
 function s.splimit(e,se,sp,st)
-	return (st&SUMMON_TYPE_RITUAL==SUMMON_TYPE_RITUAL and se:GetHandler():IsCode(61200000))
+	return se:GetHandler():IsCode(61200000)
 end
 
 function s.va3(e,c)
-	local g=Duel.GetMatchingGroupCount(s.f4,c:GetControler(),LOCATION_REMOVED,0,nil)
+	local g=Duel.GetMatchingGroup(s.f4,c:GetControler(),LOCATION_REMOVED,0,nil)
 	return g:GetClassCount(Card.GetCode)*400
 end
 

expansions/script/c79250025.lua

---异想体 焦化少女
+--异想体 归乡之途
 local s,id,o=GetID()
 s.setcard="Abnormality"
 function s.initial_effect(c)
-	--to grave
+	--spsummon from szone
 	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(id,0))
-	e1:SetCategory(CATEGORY_TOGRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e1:SetCode(EVENT_ATTACK_ANNOUNCE)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetCountLimit(1,EFFECT_COUNT_CODE_DUEL)
-	e1:SetTarget(s.tgtg)
-	e1:SetOperation(s.tgop)
+	e1:SetDescription(aux.Stringid(id,1))
+	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e1:SetType(EFFECT_TYPE_QUICK_O)
+	e1:SetRange(LOCATION_HAND)
+	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetCountLimit(1,id)
+	e1:SetHintTiming(0,TIMING_MAIN_END)
+	e1:SetCondition(s.spcon)
+	e1:SetTarget(s.sptg)
+	e1:SetOperation(s.spop)
 	c:RegisterEffect(e1)
-	--discard deck
+	--search
 	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(id,1))
-	e2:SetCategory(CATEGORY_DECKDES)
-	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e2:SetCode(EVENT_TO_GRAVE)
-	e2:SetCondition(s.discon)
-	e2:SetTarget(s.distg)
-	e2:SetOperation(s.disop)
+	e2:SetDescription(aux.Stringid(id,0))
+	e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
+	e2:SetProperty(EFFECT_FLAG_DELAY)
+	e2:SetCountLimit(3,id+1)
+	e2:SetCost(s.thcost)
+	e2:SetTarget(s.thtg)
+	e2:SetOperation(s.thop)
 	c:RegisterEffect(e2)
 end
-function s.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(aux.TRUE,tp,LOCATION_ONFIELD+LOCATION_HAND,LOCATION_ONFIELD+LOCATION_HAND,1,nil) end
-	local g=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_ONFIELD+LOCATION_HAND,LOCATION_ONFIELD+LOCATION_HAND,nil)
-	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,g,g:GetCount(),0,0)
+function s.spcon(e,tp,eg,ep,ev,re,r,rp)
+	local ph=Duel.GetCurrentPhase()
+	return (ph==PHASE_MAIN1 or ph==PHASE_MAIN2) and not Duel.IsExistingMatchingCard(Card.IsType,tp,LOCATION_MZONE,0,1,nil,TYPE_TUNER)
 end
-function s.tgop(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_ONFIELD+LOCATION_HAND,LOCATION_ONFIELD+LOCATION_HAND,nil)
-	Duel.SendtoGrave(g,REASON_EFFECT)
+function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
+		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 end
-function s.discon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():IsPreviousLocation(LOCATION_DECK+LOCATION_HAND)
+function s.spop(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	if not c:IsRelateToEffect(e) then return end
+	Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetCode(EFFECT_CHANGE_LEVEL)
+	e1:SetValue(3)
+	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
+	c:RegisterEffect(e1)
+end
+function s.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsDiscardable,tp,LOCATION_HAND,0,1,nil) end
+	Duel.DiscardHand(tp,Card.IsDiscardable,1,1,REASON_COST+REASON_DISCARD)
+end
+function s.thfilter(c)
+	return c.setcard=="Abnormality" and c:IsAbleToHand() and c:IsLevelBelow(6) and c:IsType(TYPE_MONSTER)
+end
+function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil) end
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 end
-function s.distg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
-	Duel.Hint(HINT_OPSELECTED,1-tp,e:GetDescription())
-	Duel.SetTargetPlayer(1-tp)
-	Duel.SetTargetParam(500)
-	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,500)
+function s.thop(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
+	local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK,0,1,1,nil)
+	if g:GetCount()>0 then
+		Duel.SendtoHand(g,nil,REASON_EFFECT)
+		Duel.ConfirmCards(1-tp,g)
+	end
+	if c:IsPreviousLocation(LOCATION_GRAVE) then
+		local e1=Effect.CreateEffect(e:GetHandler())
+		e1:SetType(EFFECT_TYPE_FIELD)
+		e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
+		e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+		e1:SetTargetRange(1,0)
+		e1:SetTarget(s.splimit)
+		e1:SetReset(RESET_PHASE+PHASE_END)
+		Duel.RegisterEffect(e1,tp)
+	end
 end
-function s.disop(e,tp,eg,ep,ev,re,r,rp)
-	local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
-	Duel.Damage(p,d,REASON_EFFECT)
+function s.splimit(e,c)
+	return c.setcard~="Abnormality"
 end
\ No newline at end of file