fix

expansions/script/c1.lua

---
-function c1.initial_effect(c)
-	
-end

expansions/script/c10150030.lua

@@ -19,7 +19,7 @@ function c10150030.spfilter(c,e,tp)
 	return c:IsType(TYPE_SYNCHRO) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP)
 end
 function c10150030.cfilter(c)
-	return Duel.GetLocationCountFromEx(tp,tp,c)>0
+	return Duel.GetMZoneCount(tp,c)>0
 end
 function c10150030.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then
@@ -40,7 +40,7 @@ function c10150030.target(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c10150030.activate(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if Duel.GetLocationCountFromEx(tp)>0 then
+	if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then
 	   Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	   local tc=Duel.SelectMatchingCard(tp,c10150030.spfilter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp):GetFirst()
 		if tc and Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP) then

expansions/script/c22020840.lua

@@ -64,7 +64,7 @@ function c22020840.splimit(e,c)
 	return not c:IsAttribute(ATTRIBUTE_DARK)
 end
 function c22020840.filter(c,e,tp)
-	return c:IsAttribute(ATTRIBUTE_DARK) and c:IsRace(RACE_DRAGON)) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsAttribute(ATTRIBUTE_DARK) and c:IsRace(RACE_DRAGON) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c22020840.sptg1(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c22020840.filter(chkc,e,tp) end

expansions/script/c33400008.lua

 --时崎狂三---时之战士
 function c33400008.initial_effect(c)
+c:EnableCounterPermit(0x34f)
 	aux.AddLinkProcedure(c,c33400008.mfilter,2)
 	c:EnableReviveLimit()
 		--activate from hand
@@ -14,7 +15,7 @@ function c33400008.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetCategory(CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e2:SetProperty(EFFECT_FLAG_DELAY)
+	e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
 	e2:SetCode(EVENT_CHAIN_SOLVED)
 	e2:SetCountLimit(1,33400008)
 	e2:SetRange(LOCATION_MZONE)
@@ -75,9 +76,9 @@ end
 function c33400008.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local c=e:GetHandler()
 	if chkc then return chkc:IsOnField() and chkc:IsFaceup() and chkc~=c end
-	if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,c) end
+	if chk==0 then return Duel.IsExistingTarget(nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,c) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
-	local g=Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,c)
+	local g=Duel.SelectTarget(tp,nil,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,c)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
 end
 function c33400008.activate(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c33403509.lua

@@ -17,7 +17,8 @@ function cm.initial_effect(c)
 end
 
 function cm.con(e,tp,eg,ep,ev,re,r,rp)
-	return  Duel.GetFlagEffect(tp,33413501)<(Duel.GetFlagEffect(tp,33403501)/2+1)and Duel.GetFlagEffect(tp,m+30000)==0 and Duel.GetFlagEffect(tp,33443500)==0
+  local ss=Duel.GetTurnCount()
+	return Duel.GetFlagEffect(tp,33413501)<ss and  Duel.GetFlagEffect(tp,m+30000)==0 and Duel.GetFlagEffect(tp,33443500)==0
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)  
  if chk==0 then return true end
@@ -35,52 +36,18 @@ function cm.splimit(e,c,sump,sumtype,sumpos,targetp,se)
 	return not se:GetHandler():IsSetCard(0x5349)and  not c:IsCode(33403500)
 end
 function cm.filter(c,e,tp)
-	return c:IsType(TYPE_MONSTER)and (c:IsAbleToHand() or c:IsCanBeSpecialSummoned(e,0,tp,false,false)) 
+	return c:IsType(TYPE_MONSTER)and (c:IsAbleToHand() or c:IsCanBeSpecialSummoned(e,0,tp,false,false))  and (c:IsFaceup() or c:IsLocation(LOCATION_GRAVE))
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return  chkc:GetLocation()==LOCATION_GRAVE+LOCATION_REMOVED and cm.filter(chkc,e,tp) end
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_GRAVE+LOCATION_REMOVED,LOCATION_GRAVE+LOCATION_REMOVED,1,nil,e,tp) end  
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,0)
-if e:GetLabel()==1 then 
-	local c=e:GetHandler()
-	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e2:SetCode(EVENT_CHAIN_NEGATED)
-	e2:SetCondition(cm.regcon)
-	e2:SetOperation(cm.regop2)
-	e2:SetReset(RESET_EVENT+RESET_CHAIN+RESET_PHASE+PHASE_END)
-	Duel.RegisterEffect(e2,tp)
-	Duel.RegisterFlagEffect(tp,m+20000,RESET_PHASE+PHASE_END,0,1)   --t2
-	Duel.RegisterFlagEffect(tp,33413501,RESET_PHASE+PHASE_END,0,1) --t1
-	Duel.RegisterFlagEffect(tp,33403501,0,0,0)   --duel 1
-	e:SetLabel(2)
-	end
-end
-function cm.regcon(e,tp,eg,ep,ev,re,r,rp)
-	return re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:GetHandler():IsSetCard(0x5349) and rp==tp
-end
-function cm.regop2(e,tp,eg,ep,ev,re,r,rp)
-	local n1=Duel.GetFlagEffect(tp,33413501)
-	local n2=Duel.GetFlagEffect(tp,33403501)
-	local n3=Duel.GetFlagEffect(tp,m+20000)
-	Duel.ResetFlagEffect(tp,33413501)
-	Duel.ResetFlagEffect(tp,33403501)
-	Duel.ResetFlagEffect(tp,m+20000)
-	if n1>=2 then 
-		for i=1,n1-1 do
-		Duel.RegisterFlagEffect(tp,33413501,RESET_PHASE+PHASE_END,0,1)
-		end 
-	end
-	if n2>=2 then
-		for i=1,n2-1 do
+   if e:GetLabel()==1 then 
+	Duel.RegisterFlagEffect(tp,m+20000,RESET_PHASE+PHASE_END,0,1) --t1
+	Duel.RegisterFlagEffect(tp,33413501,RESET_PHASE+PHASE_END,0,1) --t1+t2
 	Duel.RegisterFlagEffect(tp,33403501,0,0,0)  
-		end 
-	end
-	if n3>=2 then 
-		for i=1,n3 do
-		  Duel.RegisterFlagEffect(tp,m+20000,RESET_PHASE+PHASE_END,0,1)
-		end 
+	e:SetLabel(2)
 	end
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
@@ -98,6 +65,8 @@ local c=e:GetHandler()
 		Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
 		--indes
 		local e3=Effect.CreateEffect(c)
+		e3:SetDescription(aux.Stringid(m,3))
+		e3:SetProperty(EFFECT_FLAG_CLIENT_HINT)
 		e3:SetType(EFFECT_TYPE_FIELD)
 		e3:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
 		e3:SetRange(LOCATION_MZONE)

expansions/script/c33701323.lua

@@ -11,13 +11,22 @@ function c33701323.initial_effect(c)
 	e1:SetCondition(c33701323.spcon)
 	e1:SetOperation(c33701323.spop)
 	c:RegisterEffect(e1)
-	--  
+	--cannot be material
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetCode(EFFECT_CANNOT_BE_LINK_MATERIAL)
 	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e2:SetCode(EFFECT_CANNOT_BE_FUSION_MATERIAL)
 	e2:SetValue(c33701323.synlimit)
 	c:RegisterEffect(e2)
+	local e3=e2:Clone()
+	e3:SetCode(EFFECT_CANNOT_BE_SYNCHRO_MATERIAL)
+	c:RegisterEffect(e3)
+	local e4=e2:Clone()
+	e4:SetCode(EFFECT_CANNOT_BE_XYZ_MATERIAL)
+	c:RegisterEffect(e4)
+	local e5=e2:Clone()
+	e5:SetCode(EFFECT_CANNOT_BE_LINK_MATERIAL)
+	c:RegisterEffect(e5)
 end
 function c33701323.spfil(c)
 	return c:IsCanBeLinkMaterial(nil) and (c:IsType(TYPE_SPELL+TYPE_TRAP) or c:IsRace(RACE_CYBERSE))

expansions/script/c40006764.lua

@@ -42,20 +42,34 @@ function cm.initial_effect(c)
 	e4:SetOperation(cm.spop)
 	c:RegisterEffect(e4)
 end
-function cm.matfilter(c)
-	return c:IsCanOverlay() and c:IsType(TYPE_TUNER) and c:IsLevelAbove(1) and c:IsFaceup()
+function cm.tgrfilter(c)
+	return c:IsFaceup() and c:IsLevelAbove(1) and c:IsCanOverlay()
 end
-function cm.gcheck(g,tp,c)
-	return g:CheckWithSumEqual(Card.GetLevel,8,2,2) and Duel.GetLocationCountFromEx(tp,tp,g,c)>0
+function cm.tgrfilter1(c)
+	return c:IsType(TYPE_TUNER) and c:IsLevelAbove(1)
 end
-function cm.con(e,c,tp)
-	local g=Duel.GetMatchingGroup(cm.matfilter,tp,LOCATION_MZONE,0,nil)
-	return g:CheckSubGroup(cm.gcheck,2,2,tp,c)
+function cm.mnfilter(c,g)
+	return g:IsExists(cm.mnfilter2,1,c,c)
+end
+function cm.mnfilter2(c,mc)
+	return c:GetLevel()+mc:GetLevel()==8
+end
+function cm.fselect(g,tp,sc)
+	return g:GetCount()==2
+		and g:IsExists(cm.tgrfilter1,2,nil)
+		and g:IsExists(cm.mnfilter,1,nil,g)
+		and Duel.GetLocationCountFromEx(tp,tp,g,sc)>0
+end
+function cm.con(e,c)
+	if c==nil then return true end
+	local tp=c:GetControler()
+	local g=Duel.GetMatchingGroup(cm.tgrfilter,tp,LOCATION_MZONE,0,nil)
+	return g:CheckSubGroup(cm.fselect,2,2,tp,c)
 end
 function cm.op(e,tp,eg,ep,ev,re,r,rp,c)
-	local g=Duel.GetMatchingGroup(cm.matfilter,tp,LOCATION_MZONE,0,nil)
+	local g=Duel.GetMatchingGroup(cm.tgrfilter,tp,LOCATION_MZONE,0,nil)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
-	local matg=g:SelectSubGroup(tp,cm.gcheck,false,2,2,tp,c)
+	local matg=g:SelectSubGroup(tp,cm.fselect,false,2,2,tp,c)
 	local og = Group.CreateGroup()
 	for tc in aux.Next(matg) do
 		og:Merge(tc:GetOverlayGroup())

expansions/script/c40006766.lua

@@ -38,20 +38,34 @@ function cm.initial_effect(c)
 	e4:SetOperation(cm.rmop)
 	c:RegisterEffect(e4)
 end
-function cm.matfilter(c)
-	return c:IsCanOverlay() and c:IsType(TYPE_TUNER) and c:IsLevelAbove(1) and c:IsFaceup()
+function cm.tgrfilter(c)
+	return c:IsFaceup() and c:IsLevelAbove(1) and c:IsCanOverlay()
 end
-function cm.gcheck(g,tp,c)
-	return g:CheckWithSumEqual(Card.GetLevel,11,2,2) and Duel.GetLocationCountFromEx(tp,tp,g,c)>0
+function cm.tgrfilter1(c)
+	return c:IsType(TYPE_TUNER) and c:IsLevelAbove(1)
 end
-function cm.con(e,c,tp)
-	local g=Duel.GetMatchingGroup(cm.matfilter,tp,LOCATION_MZONE,0,nil)
-	return g:CheckSubGroup(cm.gcheck,2,2,tp,c)
+function cm.mnfilter(c,g)
+	return g:IsExists(cm.mnfilter2,1,c,c)
+end
+function cm.mnfilter2(c,mc)
+	return c:GetLevel()+mc:GetLevel()==11
+end
+function cm.fselect(g,tp,sc)
+	return g:GetCount()==2
+		and g:IsExists(cm.tgrfilter1,2,nil)
+		and g:IsExists(cm.mnfilter,1,nil,g)
+		and Duel.GetLocationCountFromEx(tp,tp,g,sc)>0
+end
+function cm.con(e,c)
+	if c==nil then return true end
+	local tp=c:GetControler()
+	local g=Duel.GetMatchingGroup(cm.tgrfilter,tp,LOCATION_MZONE,0,nil)
+	return g:CheckSubGroup(cm.fselect,2,2,tp,c)
 end
 function cm.op(e,tp,eg,ep,ev,re,r,rp,c)
-	local g=Duel.GetMatchingGroup(cm.matfilter,tp,LOCATION_MZONE,0,nil)
+	local g=Duel.GetMatchingGroup(cm.tgrfilter,tp,LOCATION_MZONE,0,nil)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
-	local matg=g:SelectSubGroup(tp,cm.gcheck,false,2,2,tp,c)
+	local matg=g:SelectSubGroup(tp,cm.fselect,false,2,2,tp,c)
 	local og = Group.CreateGroup()
 	for tc in aux.Next(matg) do
 		og:Merge(tc:GetOverlayGroup())
@@ -81,7 +95,7 @@ function cm.rmop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local sc=g:GetFirst()
 	if sc:IsLocation(LOCATION_REMOVED) and c:IsRelateToEffect(e) and c:IsFaceup() and sc:IsFaceup() and c:IsControler(tp)
-		and c:IsCanBeXyzMaterial(sc) and sc:IsCanBeSpecialSummoned(e,0,tp,true,false)
+		and c:IsCanBeXyzMaterial(sc) and sc:IsCanBeSpecialSummoned(e,0,tp,true,true)
 		and Duel.GetLocationCountFromEx(tp,tp,c,sc)>0
 		and Duel.SelectYesNo(tp,aux.Stringid(m,1)) then
 		Duel.BreakEffect()
@@ -91,7 +105,7 @@ function cm.rmop(e,tp,eg,ep,ev,re,r,rp)
 		end
 		sc:SetMaterial(Group.FromCards(c))
 		Duel.Overlay(sc,Group.FromCards(c))
-		Duel.SpecialSummon(sc,0,tp,tp,true,false,POS_FACEUP)
+		Duel.SpecialSummon(sc,0,tp,tp,true,true,POS_FACEUP)
 		sc:CompleteProcedure()
 	end
 end

expansions/script/c81011002.lua

 --克里斯汀·罗森塔尔
 local m=81011002
 local cm=_G["c"..m]
-xpcall(function() require("expansions/script/c81000000") end,function() require("script/c81000000") end)
 function cm.initial_effect(c)
-	--special summon
     local e1=Effect.CreateEffect(c)
     e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
     e1:SetType(EFFECT_TYPE_QUICK_O)
@@ -11,23 +9,26 @@ function cm.initial_effect(c)
     e1:SetHintTiming(0,TIMING_REMOVE+TIMING_END_PHASE)
     e1:SetRange(LOCATION_REMOVED)
     e1:SetCountLimit(1,m)
-	e1:SetCost(function(e,tp,eg,ep,ev,re,r,rp,chk)
-		local mg=Duel.GetMatchingGroup(Card.IsAbleToDeckOrExtraAsCost,tp,LOCATION_REMOVED,LOCATION_REMOVED,e:GetHandler())
-		if chk==0 then return mg:GetCount()>=10 end
-		local g=mg:Select(tp,10,10,nil)
-		Duel.SendtoDeck(g,nil,2,REASON_COST)
-	end)
+    e1:SetCost(cm.cost)
     e1:SetTarget(cm.sptg)
     e1:SetOperation(cm.spop)
     c:RegisterEffect(e1)
 end
+function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
+    if chk==0 then return Duel.GetMatchingGroupCount(Card.IsAbleToDeckOrExtraAsCost,tp,LOCATION_REMOVED,LOCATION_REMOVED,e:GetHandler())>=10 end
+     Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
+    local g=Duel.SelectMatchingCard(tp,Card.IsAbleToDeckOrExtraAsCost,tp,LOCATION_REMOVED,LOCATION_REMOVED,10,10,e:GetHandler())
+    Duel.SendtoDeck(g,nil,2,REASON_COST)
+end
+
 function cm.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 cm.spop(e,tp,eg,ep,ev,re,r,rp)
-	if e:GetHandler():IsRelateToEffect(e) then
+    if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and e:GetHandler():IsRelateToEffect(e) then
         Duel.SpecialSummon(e:GetHandler(),0,tp,tp,false,false,POS_FACEUP)
     end
 end