fix

expansions/script/c12400131.lua

@@ -148,7 +148,7 @@ end
 function s.spop(e,tp,eg,ep,ev,re,r,rp)
 	local ss=Duel.GetLocationCount(tp,LOCATION_MZONE)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
-	if ss>3 then ss=2 end 
+	if ss>2 then ss=2 end 
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONTROL)
 	local g=Duel.SelectMatchingCard(tp,s.filter,tp,0,LOCATION_MZONE,1,ss,nil)
 		if  Duel.GetControl(g,tp,0,0)~=ss then

expansions/script/c12866750.lua

@@ -113,12 +113,11 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local lp=Duel.GetLP(tp)
 	Duel.SetLP(tp,lp-2000)
+	local g=e:GetLabelObject():GetLabelObject()
 	if Duel.GetLP(tp)<lp and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and 
-	Duel.SelectYesNo(tp,aux.Stringid(id,2)) then
-		local g=e:GetLabelObject():GetLabelObject()
-		if g and g:IsExists(s.spfilter2,1,nil,e,tp) then
-		local tc=g:Select(tp,1,1,nil)
+	#g>0 and g:IsExists(s.spfilter2,1,nil,e,tp) and Duel.SelectYesNo(tp,aux.Stringid(id,2)) then
+		local sg=g:Filter(s.spfilter2,nil,e,tp)
+		local tc=sg:Select(tp,1,1,nil)
 		Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
-		end
 	end
 end
\ No newline at end of file

expansions/script/c18700781.lua

@@ -89,7 +89,7 @@ end
 function cm.thfilter(c,tc)
 	return c:IsSetCard(0x829) and c:IsType(TYPE_MONSTER)
 		and c:IsAbleToHand()
-		and not c:IsCode(tc:GetCode())
+		and c:GetCode()~=tc:GetCode()
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.tfilter,tp,LOCATION_HAND,0,1,nil,tp) end

expansions/script/c22600000.lua

 --
 local m=22600000
 local cm=_G["c"..m]
-Duel.LoadScript("123.lua")
+--Duel.LoadScript("123.lua")
 function cm.initial_effect(c)
 	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkRace,RACE_MACHINE+RACE_WARRIOR+RACE_CYBERSE),1,1,cm.matfilter)
 	c:EnableReviveLimit()
@@ -160,11 +160,12 @@ if Duel.Remove(g,POS_FACEDOWN,REASON_EFFECT)~=0 then
 		 Duel.LinkSummon(tp,sg:GetFirst(),mg,nil,1,2)
 		 end
 	   elseif e:GetHandler():IsRace(RACE_MACHINE) then
+	  	 local mg=Duel.GetMatchingGroup(Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,nil):Filter(cm.filter1,nil,e)
 		 local g=Duel.GetMatchingGroup(Card.IsLinkSummonable,tp,LOCATION_EXTRA,0,nil,nil)
 		 if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(98360333,0)) then
 		 Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 		 local sg=g:Select(tp,1,1,nil)
-		 Duel.LinkSummon(tp,sg:GetFirst(),nil,1,2)
+		 Duel.LinkSummon(tp,sg:GetFirst(),nil,nil,1,2)
 		 end
 	end 
 	if e:GetHandler():IsRace(RACE_WARRIOR) then
@@ -216,6 +217,7 @@ if Duel.Remove(g,POS_FACEDOWN,REASON_EFFECT)~=0 then
 	if e:GetHandler():IsRace(RACE_CYBERSE) and e:GetHandler():IsSetCard(0x740) then
 		local g8=Duel.GetMatchingGroup(cm.cfilter,tp,LOCATION_MZONE,0,nil)
 		--local ww=g8:GetSum(Card.GetLink)
+		Duel.DisableShuffleCheck()
 		local g3=Duel.GetDecktopGroup(1-tp,1)
 		Duel.SendtoDeck(g3,tp,2,REASON_EFFECT)
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
@@ -229,6 +231,7 @@ if Duel.Remove(g,POS_FACEDOWN,REASON_EFFECT)~=0 then
 	elseif e:GetHandler():IsRace(RACE_CYBERSE) then 
 	   	local g8=Duel.GetMatchingGroup(cm.cfilter,tp,LOCATION_MZONE,0,nil)
 		--local ww=g8:GetSum(Card.GetLink)
+		Duel.DisableShuffleCheck()
 		local g3=Duel.GetDecktopGroup(1-tp,1)
 		Duel.SendtoDeck(g3,tp,2,REASON_EFFECT)
 		--local e7=Effect.CreateEffect(e:GetHandler())
@@ -374,3 +377,4 @@ function cm.disop2(e,tp,eg,ep,ev,re,r,rp)
 	Duel.NegateEffect(ev)
 end
 --  e2:SetCode(EFFECT_ADD_RACE)
+

expansions/script/c22600218.lua

@@ -12,9 +12,7 @@ function cm.initial_effect(c)
 	e1:SetOperation(cm.mtop)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(c)
-	e2:SetCategory(CATEGORY_TODECK)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
-	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCondition(cm.con)

expansions/script/c23100129.lua

@@ -9,23 +9,23 @@ function c23100129.initial_effect(c)
 	e1:SetOperation(c23100129.operation1)
 	c:RegisterEffect(e1)  
 	--instant(chain)
-	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(23100129,0))
-	e2:SetType(EFFECT_TYPE_QUICK_O)
-	e2:SetRange(LOCATION_SZONE)
-	e2:SetCode(EVENT_CHAINING)
-	e2:SetCondition(c23100129.condition2)
-	e2:SetCost(c23100129.cost2)
-	e2:SetTarget(c23100129.target2)
-	e2:SetOperation(c23100129.operation2)
-	c:RegisterEffect(e2)  
+	local e0=Effect.CreateEffect(c)
+	e0:SetDescription(aux.Stringid(23100129,0))
+	e0:SetType(EFFECT_TYPE_QUICK_O)
+	e0:SetRange(LOCATION_SZONE)
+	e0:SetCode(EVENT_CHAINING)
+	e0:SetCondition(c23100129.condition2)
+	e0:SetCost(c23100129.cost2)
+	e0:SetTarget(c23100129.target2)
+	e0:SetOperation(c23100129.operation2)
+	c:RegisterEffect(e0)  
 	--atk up
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_UPDATE_ATTACK)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetTargetRange(LOCATION_MZONE,0)
-	e2:SetTarget(c23100129.atkfil)
+	e2:SetTarget(aux.TargetBoolFunction(c23100129.atkfil))
 	e2:SetValue(500)
 	c:RegisterEffect(e2) 
 	local e3=e2:Clone()
@@ -34,7 +34,7 @@ function c23100129.initial_effect(c)
 end
 c23100129.named_with_ZhanShuRenXing=true
 function c23100129.atkfil(c)
-	return c:IsFaceup() and (c.named_with_TeZhanRenXing or c.named_with_ZhanShuRenXing)
+	return  c.named_with_TeZhanRenXing or c.named_with_ZhanShuRenXing 
 end
 function c23100129.acfil(c) 
 	return c:IsFaceup() and c:IsCode(23100096,23100081,23100097)

expansions/script/c28100055.lua

@@ -51,7 +51,8 @@ function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return b1 or b2 end
 end
 function s.thop(e,tp,eg,ep,ev,re,r,rp)
-	local zone=e:GetHandler():GetLinkedZone()
+	local c=e:GetHandler()
+	local zone=c:GetLinkedZone()
 	local b1=Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp,zone)
 	local b2=Duel.IsExistingMatchingCard(Card.IsAbleToGrave,tp,0,LOCATION_ONFIELD,1,nil)
 	if not (b1 or b2) then return end
@@ -59,7 +60,14 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	if op==1 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 		local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp,zone)
-		Duel.SpecialSummon(g,0,tp,tp,true,false,POS_FACEUP,zone)
+		local tc=g:GetFirst()
+		if Duel.SpecialSummon(tc,0,tp,tp,true,false,POS_FACEUP,zone)~=0 and c:IsRelateToEffect(e) and not tc:IsImmuneToEffect(e) then
+			local og=c:GetOverlayGroup()
+			if og:GetCount()>0 then
+				Duel.SendtoGrave(og,REASON_RULE)
+			end
+			Duel.Overlay(tc,Group.FromCards(c))
+		end
 	else if op==2 then
 		Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_TOGRAVE)
 		local g=Duel.SelectMatchingCard(1-tp,Card.IsAbleToGrave,1-tp,LOCATION_ONFIELD,0,1,1,nil)

expansions/script/c31710020.lua

@@ -97,6 +97,6 @@ function s.drop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.drfilter(c)
-	return c:IsCode(31710001) or c:IsCode(31710007)
+	return (c:IsCode(31710001) or c:IsCode(31710007)) and c:IsFaceup()
 		
 end
\ No newline at end of file

expansions/script/c60002404.lua

@@ -121,8 +121,10 @@ function cm.checkop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterFlagEffect(0,m,RESET_CHAIN,0,1)
 end
 function cm.chkop(e,tp,eg,ep,ev,re,r,rp)
-	--if not e:GetHandler():IsOnField() then return end
-	Duel.RaiseEvent(e:GetHandler(),EVENT_CUSTOM+m,e,r,rp,ep,ev)
+	if Duel.GetFlagEffect(tp,m+10000000)==0 then
+		Duel.RaiseEvent(e:GetHandler(),EVENT_CUSTOM+m,e,r,rp,ep,ev)
+		Duel.RegisterFlagEffect(tp,m+10000000,RESET_CHAIN,0,1)
+	end
 end
 function cm.filter(c,tp)
 	local ocheck=false

expansions/script/c60002405.lua

@@ -121,8 +121,10 @@ function cm.checkop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterFlagEffect(0,m,RESET_CHAIN,0,1)
 end
 function cm.chkop(e,tp,eg,ep,ev,re,r,rp)
-	--if not e:GetHandler():IsOnField() then return end
-	Duel.RaiseEvent(e:GetHandler(),EVENT_CUSTOM+m,e,r,rp,ep,ev)
+	if Duel.GetFlagEffect(tp,m+10000000)==0 then
+		Duel.RaiseEvent(e:GetHandler(),EVENT_CUSTOM+m,e,r,rp,ep,ev)
+		Duel.RegisterFlagEffect(tp,m+10000000,RESET_CHAIN,0,1)
+	end
 end
 function cm.filter(c,tp)
 	local ocheck=false

expansions/script/c60002406.lua

@@ -121,8 +121,10 @@ function cm.checkop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterFlagEffect(0,m,RESET_CHAIN,0,1)
 end
 function cm.chkop(e,tp,eg,ep,ev,re,r,rp)
-	--if not e:GetHandler():IsOnField() then return end
-	Duel.RaiseEvent(e:GetHandler(),EVENT_CUSTOM+m,e,r,rp,ep,ev)
+	if Duel.GetFlagEffect(tp,m+10000000)==0 then
+		Duel.RaiseEvent(e:GetHandler(),EVENT_CUSTOM+m,e,r,rp,ep,ev)
+		Duel.RegisterFlagEffect(tp,m+10000000,RESET_CHAIN,0,1)
+	end
 end
 function cm.filter(c,tp)
 	local ocheck=false

expansions/script/c60002407.lua

@@ -121,8 +121,10 @@ function cm.checkop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterFlagEffect(0,m,RESET_CHAIN,0,1)
 end
 function cm.chkop(e,tp,eg,ep,ev,re,r,rp)
-	--if not e:GetHandler():IsOnField() then return end
-	Duel.RaiseEvent(e:GetHandler(),EVENT_CUSTOM+m,e,r,rp,ep,ev)
+	if Duel.GetFlagEffect(tp,m+10000000)==0 then
+		Duel.RaiseEvent(e:GetHandler(),EVENT_CUSTOM+m,e,r,rp,ep,ev)
+		Duel.RegisterFlagEffect(tp,m+10000000,RESET_CHAIN,0,1)
+	end
 end
 function cm.filter(c,tp)
 	local ocheck=false

expansions/script/c60002408.lua

@@ -121,8 +121,10 @@ function cm.checkop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterFlagEffect(0,m,RESET_CHAIN,0,1)
 end
 function cm.chkop(e,tp,eg,ep,ev,re,r,rp)
-	--if not e:GetHandler():IsOnField() then return end
-	Duel.RaiseEvent(e:GetHandler(),EVENT_CUSTOM+m,e,r,rp,ep,ev)
+	if Duel.GetFlagEffect(tp,m+10000000)==0 then
+		Duel.RaiseEvent(e:GetHandler(),EVENT_CUSTOM+m,e,r,rp,ep,ev)
+		Duel.RegisterFlagEffect(tp,m+10000000,RESET_CHAIN,0,1)
+	end
 end
 function cm.filter(c,tp)
 	local ocheck=false

expansions/script/c60010107.lua

@@ -208,7 +208,7 @@ function cm.rmfil(c,lv)
 	return c:IsType(TYPE_SYNCHRO) and c:IsLevelBelow(lv-1) and c:IsAbleToRemove()
 end
 function cm.lvcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) and e:GetHandler():GetFlagEffect(m)~=0
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_SYNCHRO) --and e:GetHandler():GetFlagEffect(m)~=0
 end
 function cm.ttlv(c)
 	return c:GetOriginalLevel()

expansions/script/c60010258.lua

@@ -20,8 +20,8 @@ function cm.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(m,0))
 	e3:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE+CATEGORY_TODECK+CATEGORY_LEAVE_GRAVE)
-	e3:SetType(EFFECT_TYPE_QUICK_O)
-	e3:SetCode(EVENT_FREE_CHAIN)
+	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
+	e3:SetCode(EVENT_PHASE+PHASE_END)
 	e3:SetRange(LOCATION_GRAVE)
 	e3:SetCountLimit(1)
 	e3:SetOperation(cm.bkop)

expansions/script/c65020185.lua

@@ -66,7 +66,11 @@ function c65020185.fusfil(c)
 	return c:IsFusionSetCard(0xcda9) and c:IsFusionType(TYPE_FUSION)
 end
 function c65020185.calfil(c)
-	return c:IsType(TYPE_FUSION) and c:IsFaceup() and c.material==nil
+	local n=false
+	for _,v in pairs(c.material) do
+		if v==true then n=true end
+	end
+	return c:IsType(TYPE_FUSION) and c:IsFaceup() and not n
 end
 function c65020185.notsoulop(e,tp,eg,ep,ev,re,r,rp)
 	local phase=Duel.GetCurrentPhase()

expansions/script/c65045006.lua

@@ -25,7 +25,11 @@ function c65045006.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c65045006.adof(c)
-	return c:IsType(TYPE_FUSION) and c:IsFaceup() and c.material==nil 
+	local n=false
+	for _,v in pairs(c.material) do
+		if v==true then n=true end
+	end
+	return c:IsType(TYPE_FUSION) and c:IsFaceup() and not n
 end
 function c65045006.adop(e,tp,eg,ep,ev,re,r,rp)
 	local phase=Duel.GetCurrentPhase()

expansions/script/c79250049.lua

@@ -90,6 +90,7 @@ function s.op(e,tp,eg,ep,ev,re,r,rp)
 			e1:SetType(EFFECT_TYPE_SINGLE)
 			e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 			e1:SetReset(RESET_EVENT+RESETS_STANDARD)
+			e1:SetValue(TYPE_SPELL+TYPE_CONTINUOUS)
 			c:RegisterEffect(e1)
 		end
 	end

expansions/script/c96071035.lua

@@ -116,12 +116,12 @@ function cm.mfilter(c)
 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,true,false) end
+		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)
 	local c=e:GetHandler()
-	if not c:IsRelateToEffect(e) or Duel.SpecialSummon(c,0,tp,tp,true,false,POS_FACEUP)==0 then return end
+	if not c:IsRelateToEffect(e) or Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)==0 then return end
 	if c:IsType(TYPE_XYZ)
 		and Duel.GetMatchingGroupCount(aux.NecroValleyFilter(cm.mfilter),tp,LOCATION_GRAVE,0,nil)>0
 		and Duel.SelectYesNo(tp,aux.Stringid(m,0)) then

expansions/script/c96071037.lua

@@ -61,7 +61,7 @@ function cm.spdtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	local tc=Duel.GetAttacker()
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and c:IsCanBeSpecialSummoned(e,0,tp,true,false) end
+		and c:IsCanBeSpecialSummoned(e,0,tp,false,false) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 	if not Duel.GetFieldCard(tp,LOCATION_PZONE,0) and not Duel.GetFieldCard(tp,LOCATION_PZONE,1) then
 		Duel.SetOperationInfo(0,CATEGORY_DISABLE,tc,1,0,0)
@@ -70,7 +70,7 @@ end
 function cm.spdop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=Duel.GetAttacker()
-	if not c:IsRelateToEffect(e) or Duel.SpecialSummon(c,0,tp,tp,true,false,POS_FACEUP)==0 then return end
+	if not c:IsRelateToEffect(e) or Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)==0 then return end
 	if tc and tc:IsRelateToBattle()
 		and not Duel.GetFieldCard(tp,LOCATION_PZONE,0) and not Duel.GetFieldCard(tp,LOCATION_PZONE,1)
 		and tc:IsControler(1-tp) and tc:IsFaceup()

expansions/script/c96071039.lua

@@ -72,7 +72,7 @@ function cm.thfilter(c)
 end
 function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_DECK,0,1,nil) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,true,false) end
+		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 end
@@ -83,7 +83,7 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 and c:IsRelateToEffect(e) then
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)
-		Duel.SpecialSummon(c,0,tp,tp,true,false,POS_FACEUP)
+		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 	end
 	Duel.ResetFlagEffect(tp,m)
 	local e1=Effect.CreateEffect(e:GetHandler())

expansions/script/c96071042.lua

@@ -73,14 +73,14 @@ function cm.tgcost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function cm.tgtg(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,true,false) end
+		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_RECOVER,nil,0,tp,2400)
 end
 function cm.tgop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.SpecialSummon(c,0,tp,tp,true,false,POS_FACEUP)
+		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 		Duel.BreakEffect()
 		Duel.Recover(tp,2400,REASON_EFFECT)
 	end

expansions/script/c96071086.lua

@@ -71,12 +71,12 @@ end
 function cm.sptg(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,true,false) end
+		and c:IsCanBeSpecialSummoned(e,0,tp,false,false) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,0,0)
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then Duel.SpecialSummon(c,0,tp,tp,true,false,POS_FACEUP) end
+	if c:IsRelateToEffect(e) then Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) end
 	local g=Duel.GetMatchingGroup(Card.IsFaceup,tp,0,LOCATION_MZONE,nil)
 	local tc=g:GetFirst()
 	while tc do

expansions/script/c96071091.lua

@@ -122,7 +122,7 @@ function cm.adesop(e,tp,eg,ep,ev,re,r,rp)
 			Duel.Destroy(eg,REASON_EFFECT)
 		end
 		Duel.BreakEffect()
-		Duel.SpecialSummon(c,0,tp,tp,true,false,POS_FACEUP)
+		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 	end
 end
 --handes

expansions/script/c96071094.lua

@@ -70,7 +70,7 @@ end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then return Duel.IsExistingMatchingCard(cm.disfilter,tp,LOCATION_EXTRA,0,1,nil) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and c:IsCanBeSpecialSummoned(e,0,tp,true,false) and Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,c) end
+		and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,c) end
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,1,tp,LOCATION_EXTRA)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,0,0)
 	local sg=Duel.GetMatchingGroup(cm.filter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,c)
@@ -82,7 +82,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.SelectMatchingCard(tp,cm.disfilter,tp,LOCATION_EXTRA,0,1,1,nil)
 	Duel.HintSelection(g)
 	if Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)~=0 then
-	if c:IsRelateToEffect(e) then Duel.SpecialSummon(c,0,tp,tp,true,false,POS_FACEUP) end
+	if c:IsRelateToEffect(e) then Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) end
 		if Duel.IsExistingMatchingCard(cm.filter,tp,0,LOCATION_ONFIELD,1,nil)
 			and Duel.SelectYesNo(tp,aux.Stringid(m,3)) then
 		Duel.BreakEffect()

expansions/script/c96071097.lua

 --墨客·慈乌稚子 姑获鸟
 local m=96071097--卡密编号
-local set=0x3ef1--侍神·森岭字段
-local set=0x5ef1--侍神·京都堺字段
+local set1=0x3ef1--侍神·森岭字段
+local set2=0x5ef1--侍神·京都堺字段
 local cm=_G["c"..m]
 function cm.initial_effect(c)
 	aux.EnableChangeCode(c,96071051,LOCATION_MZONE+LOCATION_GRAVE+LOCATION_REMOVED)--当作卡名
@@ -79,14 +79,14 @@ function cm.thfilter(c)
 end
 function cm.tgtg(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,true,false) end
+		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,0,LOCATION_DECK+LOCATION_GRAVE)
 end
 function cm.tgop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.SpecialSummon(c,0,tp,tp,true,false,POS_FACEUP)
+		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 		local g=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
 		if g:GetCount()>0 then

expansions/script/c96071102.lua

 --忍者·赤胄青甲 山兔
 local m=96071102--卡密编号
-local set=0x3ef1--侍神·森岭字段
-local set=0x5ef1--侍神·京都堺字段
+local set1=0x3ef1--侍神·森岭字段
+local set2=0x5ef1--侍神·京都堺字段
 local cm=_G["c"..m]
 function cm.initial_effect(c)
 	aux.EnableChangeCode(c,96071023,LOCATION_MZONE+LOCATION_GRAVE+LOCATION_REMOVED)--当作卡名
@@ -55,13 +55,13 @@ function cm.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
-	if chk==0 then return c:IsCanBeSpecialSummoned(e,0,tp,true,false) end
+	if chk==0 then return c:IsCanBeSpecialSummoned(e,0,tp,false,false) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,0,0)
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then
-		Duel.SpecialSummon(c,0,tp,tp,true,false,POS_FACEUP)
+		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 	end
 end
 --pendulum set

expansions/script/c96071106.lua

 --游侠·森林之姬 白狼
 local m=96071106--卡密编号
-local set=0x3ef1--侍神·森岭字段
-local set=0x5ef1--侍神·京都堺字段
+local set1=0x3ef1--侍神·森岭字段
+local set2=0x5ef1--侍神·京都堺字段
 local cm=_G["c"..m]
 function cm.initial_effect(c)
 	aux.EnableChangeCode(c,96071061,LOCATION_MZONE+LOCATION_GRAVE+LOCATION_REMOVED)--当作卡名
@@ -52,7 +52,7 @@ function cm.tgop(e,tp,eg,ep,ev,re,r,rp)
 	if not c:IsRelateToEffect(e) then return end
 	if Duel.NegateAttack() then
 		Duel.BreakEffect()
-		Duel.SpecialSummon(c,0,tp,tp,true,false,POS_FACEUP)
+		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 	end
 end
 --pendulum set

expansions/script/c96071114.lua

@@ -55,6 +55,7 @@ function cm.initial_effect(c)
 	e4:SetType(EFFECT_TYPE_SINGLE)
 	e4:SetProperty(EFFECT_FLAG_SINGLE_RANGE)--只对自己有效
 	e4:SetCode(EFFECT_EXTRA_ATTACK)--增加攻击次数
+	e4:SetRange(LOCATION_MZONE)
 	e4:SetCondition(cm.matkcon)
 	e4:SetValue(1)
 	c:RegisterEffect(e4)
@@ -123,14 +124,14 @@ end
 function cm.sptg(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,true,false) and Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,c) end
+		and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,c) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,0,0)
 	local sg=Duel.GetMatchingGroup(cm.filter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,c)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,sg,sg:GetCount(),0,0)
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then Duel.SpecialSummon(c,0,tp,tp,true,false,POS_FACEUP) end
+	if c:IsRelateToEffect(e) then Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) end
 	local sg=Duel.GetMatchingGroup(cm.filter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,aux.ExceptThisCard(e))
 	Duel.SendtoHand(sg,nil,REASON_EFFECT)
 end
@@ -189,9 +190,8 @@ function cm.eqlimit(e,c)
 	return e:GetOwner()==c
 end
 --multi attack
-function cm.matkcon(e,tp,eg,ep,ev,re,r,rp)
-	local eg=e:GetHandler():GetEquipGroup()
-	return eg:GetCount()>0
+function cm.matkcon(e)
+	return e:GetHandler():GetEquipCount()>0
 end
 --attack up
 function cm.atkval(e,c)

expansions/script/c96071116.lua

@@ -78,12 +78,12 @@ function cm.mfilter(c)
 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,true,false) end
+		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)
 	local c=e:GetHandler()
-	if not c:IsRelateToEffect(e) or Duel.SpecialSummon(c,0,tp,tp,true,false,POS_FACEUP)==0 then return end
+	if not c:IsRelateToEffect(e) or Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)==0 then return end
 	if c:IsType(TYPE_XYZ)
 		and Duel.GetMatchingGroupCount(aux.NecroValleyFilter(cm.mfilter),tp,LOCATION_ONFIELD+LOCATION_GRAVE+LOCATION_REMOVED,0,nil)>0
 		and Duel.SelectYesNo(tp,aux.Stringid(m,2)) then

expansions/script/c96071119.lua

@@ -117,14 +117,14 @@ function cm.filter(c,tp)
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
-	if chk==0 then return c:IsCanBeSpecialSummoned(e,0,tp,true,false) end
+	if chk==0 then return c:IsCanBeSpecialSummoned(e,0,tp,false,false) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,0,0)
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and c:IsRelateToEffect(e) and Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_REMOVED,LOCATION_REMOVED,1,nil,tp) then
 		local g=Duel.GetMatchingGroup(cm.filter,tp,LOCATION_REMOVED,LOCATION_REMOVED,nil)
-		Duel.SpecialSummon(c,0,tp,tp,true,false,POS_FACEUP)
+		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 		Duel.BreakEffect()
 		Duel.Overlay(c,g)
 	end

expansions/script/c96071121.lua

@@ -84,7 +84,7 @@ function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 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,true,false) and Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>=5 or Duel.GetFieldGroupCount(1-tp,LOCATION_DECK,0)>=5 end
+		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>=5 or Duel.GetFieldGroupCount(1-tp,LOCATION_DECK,0)>=5 end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
@@ -101,7 +101,7 @@ function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 		ac=Duel.AnnounceNumber(tp,table.unpack(t))
 		end
 	if c:IsRelateToEffect(e) then
-		Duel.SpecialSummon(c,0,tp,tp,true,false,POS_FACEUP)
+		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 	end
 	Duel.BreakEffect()
 	Duel.SortDecktop(tp,tp,ac)

expansions/script/c96071127.lua

@@ -119,13 +119,13 @@ function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 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,true,false) end
+		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)
 	local c=e:GetHandler()
 	if not c:IsRelateToEffect(e) then return end
-	if Duel.SpecialSummon(c,0,tp,tp,true,false,POS_FACEUP)~=0
+	if Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)~=0
 			and Duel.SelectYesNo(tp,aux.Stringid(m,1)) then
 		Duel.BreakEffect()
 		Duel.ShuffleHand(tp)
@@ -141,7 +141,7 @@ function cm.pfilter(c,se)
 	return c:IsControler(tp) and c:IsSetCard(0xef1)
 end
 function cm.pencon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(cm.pfilter,2,nil,tp)
+	return e:GetHandler():IsFaceup() and eg:IsExists(cm.pfilter,2,nil,tp)
 end
 function cm.pentg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1) end

expansions/script/c96071131.lua

@@ -111,14 +111,14 @@ end
 function cm.sptg(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,true,false) and Duel.IsExistingMatchingCard(cm.dfilter,tp,LOCATION_GRAVE+LOCATION_ONFIELD,0,1,nil) end
+		and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.IsExistingMatchingCard(cm.dfilter,tp,LOCATION_GRAVE+LOCATION_ONFIELD,0,1,nil) end
 	local ct=Duel.GetMatchingGroup(cm.dfilter,tp,LOCATION_GRAVE+LOCATION_ONFIELD,0,nil):GetClassCount(Card.GetCode)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,c,1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,ct*300)
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) then Duel.SpecialSummon(c,0,tp,tp,true,false,POS_FACEUP) end
+	if c:IsRelateToEffect(e) then Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP) end
 	local ct=Duel.GetMatchingGroup(cm.dfilter,tp,LOCATION_GRAVE+LOCATION_ONFIELD,0,nil):GetClassCount(Card.GetCode)
 	if ct>0 then
 		Duel.BreakEffect()