fix

expansions/script/c33400210.lua

@@ -47,7 +47,7 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE+LOCATION_DECK) and cm.filter(chkc,e,tp) end
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_GRAVE,0,1,nil,e,tp) and Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_DECK,0,1,nil,e,tp) end
-	local g=Duel.GetMatchingGroup(cm.filter,tp,LOCATION_DECK+LOCATION_GRAVE,nil,e,tp)
+	local g=Duel.GetMatchingGroup(cm.filter,tp,LOCATION_DECK+LOCATION_GRAVE,0,nil,e,tp)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,0,0)
 end
 function cm.activate(e,tp,eg,ep,ev,re,r,rp)
@@ -60,10 +60,12 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	if tc:IsCode(ac) then 
 	   if Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_DECK,0,1,nil,e,tp) then 
 		  Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-		  local g1=Duel.SelectMatchingCard(tp,cm.filter,tp,LOCATION_DECK,0,1,1,nil)
+		  local g1=Duel.SelectMatchingCard(tp,cm.filter,tp,LOCATION_DECK,0,1,1,nil,e,tp)
 		  if g1:GetCount()>0 then
+		  Duel.DisableShuffleCheck()
 		  Duel.SpecialSummon(g1,0,tp,tp,false,false,POS_FACEUP)
 		  end
+		  Duel.ShuffleDeck(tp)
 		   local ct1=Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)
 			if ct1>2 then ct1=2 end
 			local g=Duel.GetDecktopGroup(tp,ct1)
@@ -73,7 +75,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	else  
 		if Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_GRAVE,0,1,nil,e,tp) then 
 		  Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-		  local g1=Duel.SelectMatchingCard(tp,cm.filter,tp,LOCATION_GRAVE,0,1,1,nil)
+		  local g1=Duel.SelectMatchingCard(tp,cm.filter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
 		  if g1:GetCount()>0 then
 		  Duel.SpecialSummon(g1,0,tp,tp,false,false,POS_FACEUP)
 		  end

expansions/script/c33400402.lua

@@ -19,7 +19,7 @@ function c33400402.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetCode(EVENT_TO_GRAVE)
 	e1:SetProperty(EFFECT_FLAG_DELAY)
-	e1:SetCountLimit(1,33400402)
+	e1:SetCountLimit(1,33400402+10000)
 	e1:SetCondition(c33400402.thcon)
 	e1:SetOperation(c33400402.thop)
 	c:RegisterEffect(e1)
@@ -28,7 +28,7 @@ function c33400402.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(Card.IsSetCard,1,nil,0x6343) or eg:IsExists(Card.IsSetCard,1,nil,0x5343)
 end
 function c33400402.spfilter1(c,e,tp)
-	return  c:IsSetCard(0x341) or c:IsSetCard(0x5342) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return  (c:IsSetCard(0x341) or c:IsSetCard(0x5342)) and c:IsType(TYPE_MONSTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c33400402.sptg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
@@ -60,7 +60,7 @@ function c33400402.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 end
 function c33400402.thfilter(c)
-	return (c:IsSetCard(0x341) or c:IsSetCard(0x5342)) and c:IsAbleToHand() and not c:IsCode(33400402)
+	return (c:IsSetCard(0x341) or c:IsSetCard(0x5342)) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand() and not c:IsCode(33400402)
 end
 function c33400402.thcon1(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c33400402.thfilter,tp,LOCATION_GRAVE,0,1,nil)

expansions/script/c33400403.lua

@@ -18,7 +18,7 @@ function c33400403.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetCountLimit(1,33400403)
+	e2:SetCountLimit(1,33400403+10000)
 	e2:SetTarget(c33400403.settg)
 	e2:SetOperation(c33400403.setop)
 	c:RegisterEffect(e2)
@@ -30,7 +30,7 @@ function c33400403.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK)
 end
 function c33400403.thfilter(c)
-	return (c:IsSetCard(0x5342) or c:IsSetCard(0x6343) or c:IsSetCard(0x5343)) and c:IsAbleToHand()
+	return ((c:IsSetCard(0x5342) and c:IsType(TYPE_MONSTER)) or (c:IsSetCard(0x6343) or c:IsSetCard(0x5343))) and c:IsAbleToHand()
 end
 function c33400403.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c33400403.thfilter,tp,LOCATION_DECK,0,1,nil)  end
@@ -44,7 +44,7 @@ function c33400403.thop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.ConfirmCards(1-tp,g)
 	end 
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
-	local g2=Duel.SelectMatchingCard(tp,c33400403.thfilter,tp,LOCATION_ONFIELD,0,1,1,nil)
+	local g2=Duel.SelectMatchingCard(tp,nil,tp,LOCATION_ONFIELD,0,1,1,nil)
 	Duel.Destroy(g2,REASON_EFFECT)
 end
 

expansions/script/c33400406.lua

@@ -37,7 +37,7 @@ function c33400406.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_XYZ)
 end
 function c33400406.thfilter(c,tp)
-	return c:IsSetCard(0x5343)  and (c:IsAbleToHand() or c:GetActivateEffect():IsActivatable(tp))
+	return c:IsSetCard(0x5343)  and (c:IsAbleToHand() or not c:IsForbidden())
 end
 function c33400406.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c33400406.thfilter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil,tp) end
@@ -48,7 +48,7 @@ function c33400406.thop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=g:GetFirst()
 	if tc then
 		local b1=tc:IsAbleToHand()
-		local b2=tc:GetActivateEffect():IsActivatable(tp)
+		local b2=not tc:IsForbidden()
 		if b1 and (not b2 or Duel.SelectOption(tp,1190,1150)==0) then
 			Duel.SendtoHand(tc,nil,REASON_EFFECT)
 			Duel.ConfirmCards(1-tp,tc)

expansions/script/c33400410.lua

@@ -112,6 +112,7 @@ function c33400410.effop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetRange(LOCATION_MZONE)
+	e1:SetCountLimit(1) 
 	e1:SetCondition(c33400410.recon)
 	e1:SetCost(c33400410.spcost)
 	e1:SetTarget(c33400410.retg)

expansions/script/c33400426.lua

@@ -75,23 +75,24 @@ function c33400426.thtg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 			Duel.IsExistingMatchingCard(c33400426.cccfilter2,tp,LOCATION_MZONE,0,1,nil))) 
 	then
 	   e:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY+EFFECT_FLAG_CANNOT_INACTIVATE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_CANNOT_NEGATE)
-	end	
+	end 
 end
 function c33400426.thfilter2(c,code)
 	return c:IsSetCard(0x9343)  and not c:IsCode(code) and c:IsAbleToHand()
 end
 function c33400426.thop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
-	if tc:IsRelateToEffect(e) and Duel.SendtoDeck(tc,nil,2,REASON_EFFECT) and Duel.IsExistingTarget(c33400426.thfilter2,tp,LOCATION_DECK,0,1,nil,tc:GetCode())then
+	if tc:IsRelateToEffect(e) and Duel.SendtoDeck(tc,nil,2,REASON_EFFECT) and Duel.IsExistingMatchingCard(c33400426.thfilter2,tp,LOCATION_DECK,0,1,nil,tc:GetCode())then
 		if Duel.SelectYesNo(tp,aux.Stringid(33400426,0)) then 
 			 Duel.BreakEffect()
 			 local g=Duel.SelectMatchingCard(tp,c33400426.thfilter2,tp,LOCATION_DECK,0,1,1,nil,tc:GetCode())
 			 if g:GetCount()>0 then
 				Duel.SendtoHand(g,tp,REASON_EFFECT)
-				Duel.ConfirmCards(1-tp,g)		  
+				Duel.ConfirmCards(1-tp,g)		
 			 end
 		end
 	end
+local c=e:GetHandler()
 	 --inactivatable
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_FIELD)

expansions/script/c33400427.lua

@@ -73,15 +73,15 @@ function c33400427.spop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.SelectMatchingCard(tp,c33400427.spfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp)
 	if g:GetCount()>0 then
 		Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
-		if  Duel.IsExistingMatchingCard(c33400427.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp) and not Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_MZONE,0,1,nil,0x341)and Duel.IsExistingMatchingCard(Card.IsSetCard,tp,0,LOCATION_MZONE,1,nil,0x341)   
+		if  Duel.IsExistingMatchingCard(c33400427.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp) and ((not Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_MZONE,0,1,nil,0x341)and Duel.IsExistingMatchingCard(Card.IsSetCard,tp,0,LOCATION_MZONE,1,nil,0x341) )
 		or (  Duel.IsExistingMatchingCard(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil) and 
 			(Duel.IsExistingMatchingCard(c33400427.cccfilter1,tp,LOCATION_ONFIELD,0,1,nil) or 
-			Duel.IsExistingMatchingCard(c33400427.cccfilter2,tp,LOCATION_MZONE,0,1,nil))) 
+			Duel.IsExistingMatchingCard(c33400427.cccfilter2,tp,LOCATION_MZONE,0,1,nil))) )
 		then
 			if Duel.SelectYesNo(tp,aux.Stringid(33400427,3)) then 
 				  local g2=Duel.SelectMatchingCard(tp,c33400427.spfilter,tp,LOCATION_HAND,0,1,1,nil,e,tp)
 				  Duel.SpecialSummon(g2,0,tp,tp,false,false,POS_FACEUP)
-			end			
+			end		 
 		end
 	end
 end
@@ -137,7 +137,7 @@ function c33400427.xyzop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetMatchingGroup(c33400427.xyzfilter,tp,LOCATION_EXTRA,0,nil)
 	if g:GetCount()>0 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-		local tg=g:Select(tp,1,1,nil)	
+		local tg=g:Select(tp,1,1,nil)   
 		 if Duel.XyzSummon(tp,tg:GetFirst(),nil) and  not Duel.IsExistingMatchingCard(c33400427.spcfilter,tp,LOCATION_MZONE,0,1,nil) then
 				if  Duel.IsExistingMatchingCard(c33400427.spcfilter,tp,0,LOCATION_MZONE,1,nil)   
 				or

expansions/script/c33400436.lua

@@ -34,6 +34,7 @@ function c33400436.initial_effect(c)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCountLimit(1,33400436)
 	e3:SetCondition(c33400436.condition)
+	e3:SetCost(c33400436.atkcost)
 	e3:SetTarget(c33400436.destg)
 	e3:SetOperation(c33400436.operation3)
 	c:RegisterEffect(e3)

expansions/script/c33401035.lua

@@ -24,7 +24,7 @@ c:EnableReviveLimit()
 	e1:SetTarget(cm.destg)
 	e1:SetOperation(cm.desop)
 	c:RegisterEffect(e1)
---counter
+--ATK
 	local e2=Effect.CreateEffect(c)
 	e2:SetCategory(CATEGORY_ATKCHANGE)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
@@ -107,7 +107,7 @@ function cm.atkop(e,tp,eg,ep,ev,re,r,rp)
 			local e1=Effect.CreateEffect(e:GetHandler())
 			e1:SetType(EFFECT_TYPE_SINGLE)
 			e1:SetCode(EFFECT_UPDATE_ATTACK)
-			e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
+			e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 			e1:SetValue(ev)
 			sc:RegisterEffect(e1)
 			sc=g:GetNext()

expansions/script/c33401309.lua

@@ -30,7 +30,7 @@ function c33401309.matfilter(c)
 end
 
 function c33401309.uqfilter(c)
-		return c:GetOriginalCode(33401309) 
+		return c:GetOriginalCode()==33401309 
 end
 
 function c33401309.thfilter2(c)