repo 10.1

expansions/script/c24865325.lua

@@ -50,7 +50,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e2,tp)
 end
 function cm.splimit(e,c)
-	return not (c:GetLevel()%2==0) and not (c:GetRank()%2==0) and not (c:GetLink()%2==0)
+	return  c:GetLevel()%2~=0 or c:GetRank()%2~=0 or c:GetLink()%2~=0
 end
 --改变等级
 function cm.spfilter(c)

expansions/script/c24865326.lua

@@ -55,7 +55,7 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 end
 function cm.splimit(e,c)
-	return  not (c:GetLevel()%2==0) and not (c:GetRank()%2==0) and not (c:GetLink()%2==0)
+	return c:GetLevel()%2~=0 or c:GetRank()%2~=0 or c:GetLink()%2~=0
 end
 --检索怪兽
 function cm.spfilter(c)

expansions/script/c24865327.lua

@@ -42,5 +42,5 @@ function cm.hop(e,tp,eg,ep,ev,re,r,rp)
         Duel.RegisterEffect(e1,tp)
 end
 function cm.splimit(e,c)
-	return  not (c:GetLevel()%2==0) and not (c:GetRank()%2==0) and not (c:GetLink()%2==0)
+	return c:GetLevel()%2~=0 or c:GetRank()%2~=0 or c:GetLink()%2~=0
 end
\ No newline at end of file

expansions/script/c24865328.lua

@@ -90,5 +90,5 @@ function cm.ntop(e,tp,eg,ep,ev,re,r,rp,c)
         Duel.RegisterEffect(e1,tp)
 end
 function cm.splimit(e,c)
-	return  not (c:GetLevel()%2==0) and not (c:GetRank()%2==0) and not (c:GetLink()%2==0)
+	return  c:GetLevel()%2~=0 or c:GetRank()%2~=0 or c:GetLink()%2~=0
 end
\ No newline at end of file

expansions/script/c24865329.lua

@@ -2,7 +2,7 @@
 local m=24865329
 local cm=_G["c"..m]
 function c24865329.initial_effect(c)
-    local e1=Effect.CreateEffect(c)
+	local e1=Effect.CreateEffect(c)
     e1:SetDescription(aux.Stringid(m,0))
     e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
     e1:SetType(EFFECT_TYPE_IGNITION)
@@ -25,7 +25,7 @@ function c24865329.initial_effect(c)
 	c:RegisterEffect(e3)
     local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(m,0))
-	e4:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_TODECK)
+	e4:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e4:SetType(EFFECT_TYPE_IGNITION)
 	e4:SetRange(LOCATION_MZONE)
 	e4:SetCountLimit(m+200)
@@ -37,10 +37,14 @@ cm.Plato=true
 function cm.spfilter(c)
 	return c:IsType(TYPE_MONSTER)  and not c:IsPublic()
 end
+function cm.fselect(g,c)
+	local tp=c:GetControler()
+	return g:GetSum(Card.GetLevel)>=20 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0
+end
 function cm.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
     local c=e:GetHandler()
 	local g=Duel.GetMatchingGroup(cm.spfilter,tp,LOCATION_HAND,0,nil)
-	if chk==0 then return  g:CheckSubGroup(cm.fselect,1,#g,c) end
+	if chk==0 then return g:CheckSubGroup(cm.fselect,1,#g,c) end
 	local sg=g:SelectWithSumGreater(tp,Card.GetLevel,20)
 	Duel.ConfirmCards(1-tp,sg)
 	Duel.ShuffleHand(tp)
@@ -69,7 +73,7 @@ function cm.lvop(e,tp,eg,ep,ev,re,r,rp)
 end
 ---特招变等级
 function cm.srfilter(c)
-	return c.Plato and not c:IsCode(m) and c:IsAbleToHand()
+	return c.Plato and not c:IsCode(m) and c:IsAbleToHand() and c:IsType(TYPE_MONSTER)
 end
 function cm.srtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.srfilter,tp,LOCATION_DECK,0,1,nil) end
@@ -83,7 +87,7 @@ function cm.srop(e,tp,eg,ep,ev,re,r,rp)
         Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)
 		Duel.ShuffleDeck(tp)
-   	end     
+   	end
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
@@ -94,5 +98,5 @@ function cm.srop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 end
 function cm.splimit(e,c)
-	return  not (c:GetLevel()%2==0) and not (c:GetRank()%2==0) and not (c:GetLink()%2==0)
+	return  c:GetLevel()%2~=0 or c:GetRank()%2~=0 or c:GetLink()%2~=0
 end
\ No newline at end of file

expansions/script/c24865330.lua

@@ -78,5 +78,5 @@ function cm.spnop(e,tp,eg,ep,ev,re,r,rp)
     Duel.RegisterEffect(e1,tp)
 end
 function cm.splimit(e,c)
-	return  not (c:GetLevel()%2==0) and not (c:GetRank()%2==0) and not (c:GetLink()%2==0)
+	return  c:GetLevel()%2~=0 or c:GetRank()%2~=0 or c:GetLink()%2~=0
 end
\ No newline at end of file

expansions/script/c30553211.lua

@@ -104,6 +104,7 @@ function c30553211.spop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.MoveSequence(mtc,0)
 		Duel.ConfirmDecktop(tp,1)
 		end
+		Duel.DisableShuffleCheck()
 		Duel.SendtoDeck(e:GetHandler(),tp,0,REASON_EFFECT)
 	end
 end
\ No newline at end of file

expansions/script/c33200917.lua

@@ -80,6 +80,7 @@ function c33200917.spoperation(e,tp,eg,ep,ev,re,r,rp)
   if g:GetCount()>0 then
 	local tc=g:GetFirst()
 	if Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)~=0 then
+		tc:RegisterFlagEffect(33200917,RESET_EVENT+RESETS_STANDARD,0,1,fid)
 		local e2=Effect.CreateEffect(e:GetHandler())
 		e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 		e2:SetCode(EVENT_PHASE+PHASE_END)

expansions/script/c33201018.lua

@@ -30,6 +30,7 @@ end
 
 function s.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(nil,tp,0,LOCATION_ONFIELD,1,nil) and Duel.IsExistingMatchingCard(s.desfilter,tp,LOCATION_ONFIELD,0,1,nil) end
+	Duel.SetOperationInfo(0,CATEGORY_DESTROY,nil,0,0,0)
 end
 function s.desfilter(c)
 	return (c:IsRace(RACE_ZOMBIE) or c:IsCode(33201009)) and c:IsFaceup()

expansions/script/c33401307.lua

 --五河士道 祈福
-local m=m
+local m=33401307
 local cm=_G["c"..m]
 function cm.initial_effect(c)
 	 --link summon

expansions/script/c64800171.lua

+--邪骨团 狂牛比尔
+local s,id,o=GetID()
+function s.initial_effect(c)
+	--link summon
+	aux.AddLinkProcedure(c,nil,2,2,s.lcheck)
+	c:EnableReviveLimit()
+	--extra link
+	local e0=Effect.CreateEffect(c)
+	e0:SetType(EFFECT_TYPE_FIELD)
+	e0:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_IGNORE_IMMUNE)
+	e0:SetRange(LOCATION_EXTRA)
+	e0:SetTarget(s.mattg)
+	e0:SetCode(EFFECT_EXTRA_LINK_MATERIAL)
+	e0:SetTargetRange(LOCATION_SZONE,0)
+	e0:SetValue(s.matval)
+	c:RegisterEffect(e0)  
+	--set
+	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(id,0))
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
+	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
+	e1:SetCountLimit(1,id)
+	e1:SetCondition(s.thcon)
+	e1:SetTarget(s.thtg)
+	e1:SetOperation(s.thop)
+	c:RegisterEffect(e1)
+end
+s.setname="Zx02"
+
+--e0
+function s.lcheck(g,lc)
+	return g:IsExists(Card.IsLinkRace,1,nil,RACE_ZOMBIE)
+end
+function s.matval(e,lc,mg,c,tp)
+	if e:GetHandler()~=lc then return false,nil end
+	return true,true
+end
+function s.mattg(e,c)
+	return c:IsFaceup() and c:IsLinkType(TYPE_MONSTER) and c.setname=="Zx02"
+end
+
+--e1
+function s.thcon(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK)
+end
+function s.thfilter(c)
+	return c.setname=="Zx02" and c:IsType(TYPE_MONSTER) and not c:IsForbidden() 
+end
+function s.mfilter(c)
+	return c.setname=="Zx02" and c:IsPreviousLocation(LOCATION_MZONE) and c:IsType(TYPE_MONSTER)
+end
+function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
+	local mc=e:GetHandler():GetMaterial():Filter(s.mfilter,nil):GetCount()
+	if chk==0 then return mc>0 and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) and Duel.GetLocationCount(tp,LOCATION_SZONE)>0 end
+end
+function s.thop(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return end
+	local mc=c:GetMaterial():Filter(s.mfilter,nil):GetCount()
+	if Duel.GetLocationCount(tp,LOCATION_SZONE)==1 then mc=1 end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
+	local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,mc,nil)
+	for tc in aux.Next(g) do
+		local e1=Effect.CreateEffect(c)
+		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetCode(EFFECT_CHANGE_TYPE)
+		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+		e1:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD)
+		e1:SetValue(TYPE_CONTINUOUS+TYPE_SPELL)
+		tc:RegisterEffect(e1)
+		Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
+	end
+end
\ No newline at end of file

expansions/script/c65071047.lua

@@ -24,9 +24,9 @@ function c65071047.spop(e,tp,eg,ep,ev,re,r,rp)
 	local t2=Duel.IsExistingMatchingCard(Card.IsCanBeSpecialSummoned,tp,LOCATION_DECK,0,1,nil,e,0,tp,false,false) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 
 	local op=2
 	if t1 and t2 then
-		op=Duel.SelectOption(1-tp,aux.Stringid(93445075,0),aux.Stringid(93445075,1))
-	elseif t1 then op=Duel.SelectOption(1-tp,aux.Stringid(93445075,0))
-	elseif t2 then op=Duel.SelectOption(1-tp,aux.Stringid(93445075,1))+1
+		op=Duel.SelectOption(1-tp,aux.Stringid(65071047,0),aux.Stringid(65071047,1))
+	elseif t1 then op=Duel.SelectOption(1-tp,aux.Stringid(65071047,0))
+	elseif t2 then op=Duel.SelectOption(1-tp,aux.Stringid(65071047,1))+1
 	else return end
 	if op==0 then
 		local g=Duel.GetFieldGroup(tp,0,LOCATION_ONFIELD)

expansions/script/c67200299.lua

@@ -24,7 +24,7 @@ end
 function c67200299.link_mat_filter(c,lc)
 	local con=c:IsSetCard(0x674) and c:IsCanBeLinkMaterial(lc)
 	local con_mzone=c:IsLocation(LOCATION_MZONE) and c:IsFaceup()
-	local con_remove=c:IsLocation(LOCATION_SZONE) and c:IsReleasable()
+	local con_remove=c:IsLocation(LOCATION_SZONE) and c:IsReleasable() and c:IsType(TYPE_PENDULUM)
 	local con_extra=false
 	local tp=lc:GetControler()
 	local le={c:IsHasEffect(EFFECT_EXTRA_LINK_MATERIAL,tp)}

expansions/script/c67200324.lua

@@ -26,7 +26,7 @@ function c67200324.negtg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c67200324.negop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) then
+	if Duel.NegateActivation(ev) and c:IsRelateToEffect(e) and re:GetHandler():IsRelateToEffect(re) then
 		Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true)
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetDescription(aux.Stringid(67200324,1))

expansions/script/c67200601.lua

@@ -49,8 +49,8 @@ function c67200601.RitualCheckEqual(g,c,lscale)
 	return g:CheckWithSumEqual(c67200601.GetCappedLeftScale,lscale,#g,#g)
 end
 function c67200601.RitualCheck(g,tp,c,lscale,greater_or_equal)
-	return ((c:IsLocation(LOCATION_HAND) and Duel.GetLocationCount(tp,g,tp)>0) or
-		(c:IsLocation(LOCATION_EXTRA) and Duel.GetLocationCountFromEx(tp,tp,g,c)>0)) and c67200601["RitualCheck"..greater_or_equal](g,c,lscale) and (not c.mat_group_check or c.mat_group_check(g,tp))
+	return ((c:IsLocation(LOCATION_HAND) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0) or
+		(c:IsLocation(LOCATION_EXTRA) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0)) and c67200601["RitualCheck"..greater_or_equal](g,c,lscale) and (not c.mat_group_check or c.mat_group_check(g,tp))
 		and (not aux.RCheckAdditional or aux.RCheckAdditional(tp,g,c))
 end
 function c67200601.RitualCheckAdditional(c,lscale,greater_or_equal)