fixed

expansions/script/c24400005.lua

@@ -76,7 +76,7 @@ function c24400005.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c24400005.xthfilter(c)
-	return c:IsCode(23100005) and c:IsAbleToHand()
+	return c:IsCode(24400005) and c:IsAbleToHand()
 end
 function c24400005.thtg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

expansions/script/c31300020.lua

@@ -103,15 +103,16 @@ function s.filter1(c,e)
 	return c:IsFaceupEx() and c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToDeck() and not c:IsImmuneToEffect(e)
 end
 function s.filter2(c,e,tp,m,f,chkf,check)
-	return c:IsType(TYPE_FUSION) and (check or c:IsAttack(35)) and (not f or f(c))
+	return c:IsType(TYPE_FUSION) and (check or c:GetBaseAttack(35)) and (not f or f(c))
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
 end
 function s.checkfilter(c)
-	return c:IsAttack(35) and c:IsFaceup()
+	return c:GetBaseAttack(35) and c:IsFaceup()
 end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then
+		if Duel.GetLocationCount(tp,LOCATION_MZONE)==0 then return end
 		local chkf=tp
 		local check=Duel.IsExistingMatchingCard(s.checkfilter,tp,LOCATION_MZONE,0,1,nil)
 		local mg=Duel.GetMatchingGroup(s.filter0,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,c)

expansions/script/c31300023.lua

@@ -83,15 +83,16 @@ function s.filter1(c,e)
 	return c:IsFaceupEx() and c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToDeck() and not c:IsImmuneToEffect(e)
 end
 function s.filter2(c,e,tp,m,f,chkf,check)
-	return c:IsType(TYPE_FUSION) and (check or c:IsAttack(35)) and (not f or f(c))
+	return c:IsType(TYPE_FUSION) and (check or c:GetBaseAttack(35)) and (not f or f(c))
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
 end
 function s.checkfilter(c)
-	return c:IsAttack(35) and c:IsFaceup()
+	return c:GetBaseAttack(35) and c:IsFaceup()
 end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then
+		if Duel.GetLocationCount(tp,LOCATION_MZONE)==0 then return end
 		local chkf=tp
 		local check=Duel.IsExistingMatchingCard(s.checkfilter,tp,LOCATION_MZONE,0,1,nil)
 		local mg=Duel.GetMatchingGroup(s.filter0,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,c)

expansions/script/c31300024.lua

@@ -58,15 +58,16 @@ function s.filter1(c,e)
 	return c:IsFaceupEx() and c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToDeck() and not c:IsImmuneToEffect(e)
 end
 function s.filter2(c,e,tp,m,f,chkf,check)
-	return c:IsType(TYPE_FUSION) and (check or c:IsAttack(35)) and (not f or f(c))
+	return c:IsType(TYPE_FUSION) and (check or c:GetBaseAttack(35)) and (not f or f(c))
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
 end
 function s.checkfilter(c)
-	return c:IsAttack(35) and c:IsFaceup()
+	return c:GetBaseAttack(35) and c:IsFaceup()
 end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then
+		if Duel.GetLocationCount(tp,LOCATION_MZONE)==0 then return end
 		local chkf=tp
 		local check=Duel.IsExistingMatchingCard(s.checkfilter,tp,LOCATION_MZONE,0,1,nil)
 		local mg=Duel.GetMatchingGroup(s.filter0,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,c)

expansions/script/c31300025.lua

@@ -74,15 +74,16 @@ function s.filter1(c,e)
 	return c:IsFaceupEx() and c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToDeck() and not c:IsImmuneToEffect(e)
 end
 function s.filter2(c,e,tp,m,f,chkf,check)
-	return c:IsType(TYPE_FUSION) and (check or c:IsAttack(35)) and (not f or f(c))
+	return c:IsType(TYPE_FUSION) and (check or c:GetBaseAttack(35)) and (not f or f(c))
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
 end
 function s.checkfilter(c)
-	return c:IsAttack(35) and c:IsFaceup()
+	return c:GetBaseAttack(35) and c:IsFaceup()
 end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then
+		if Duel.GetLocationCount(tp,LOCATION_MZONE)==0 then return end
 		local chkf=tp
 		local check=Duel.IsExistingMatchingCard(s.checkfilter,tp,LOCATION_MZONE,0,1,nil)
 		local mg=Duel.GetMatchingGroup(s.filter0,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,c)

expansions/script/c31300026.lua

@@ -43,7 +43,7 @@ function s.damop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if not c:IsRelateToEffect(e) or c:IsFacedown() then return end
 	local d=Duel.TossDice(tp,1)*350
-	Duel.Damage(tp,d,REASON_EFFECT)
+	Duel.Damage(1-tp,d,REASON_EFFECT)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetCode(EFFECT_UPDATE_ATTACK)
@@ -66,15 +66,16 @@ function s.filter1(c,e)
 	return c:IsFaceupEx() and c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToDeck() and not c:IsImmuneToEffect(e)
 end
 function s.filter2(c,e,tp,m,f,chkf,check)
-	return c:IsType(TYPE_FUSION) and (check or c:IsAttack(35)) and (not f or f(c))
+	return c:IsType(TYPE_FUSION) and (check or c:GetBaseAttack(35)) and (not f or f(c))
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)
 end
 function s.checkfilter(c)
-	return c:IsAttack(35) and c:IsFaceup()
+	return c:GetBaseAttack(35) and c:IsFaceup()
 end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then
+		if Duel.GetLocationCount(tp,LOCATION_MZONE)==0 then return end
 		local chkf=tp
 		local check=Duel.IsExistingMatchingCard(s.checkfilter,tp,LOCATION_MZONE,0,1,nil)
 		local mg=Duel.GetMatchingGroup(s.filter0,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,c)

expansions/script/c31300030.lua

@@ -21,16 +21,16 @@ function s.initial_effect(c)
 	e2:SetOperation(s.lzop)
 	c:RegisterEffect(e2)
 end
-function s.tgfilter(c)
+function s.egfilter(c)
 	return c:IsAbleToGrave() and c:IsAttack(35) and c:IsType(TYPE_FUSION)
 end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(s.tgfilter,tp,LOCATION_EXTRA,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(s.egfilter,tp,LOCATION_EXTRA,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,tp,LOCATION_EXTRA)
 end
 function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-	local g=Duel.SelectMatchingCard(tp,s.tgfilter,tp,LOCATION_EXTRA,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,s.egfilter,tp,LOCATION_EXTRA,0,1,1,nil)
 	if g:GetCount()>0 then
 		Duel.SendtoGrave(g,REASON_EFFECT)
 	end

expansions/script/c31300031.lua

@@ -64,8 +64,8 @@ function s.gb(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local chkf=tp
 	local b1=Duel.IsExistingMatchingCard(Card.IsSynchroSummonable,1-tp,LOCATION_EXTRA,0,1,nil,nil)
-	local b2=Duel.IsExistingMatchingCard(s.xyzfilter,tp,LOCATION_EXTRA,0,1,nil)
-	local b3=Duel.IsExistingMatchingCard(s.linkfilter,tp,LOCATION_EXTRA,0,1,nil)
+	local b2=Duel.IsExistingMatchingCard(s.xyzfilter,1-tp,LOCATION_EXTRA,0,1,nil)
+	local b3=Duel.IsExistingMatchingCard(s.linkfilter,1-tp,LOCATION_EXTRA,0,1,nil)
 	local b4=Duel.IsExistingMatchingCard(s.adfilter,1-tp,LOCATION_HAND,0,1,nil)
 	local emg1=Duel.GetFusionMaterial(1-tp)
 	local b5=Duel.IsExistingMatchingCard(s.filter2,1-tp,LOCATION_EXTRA,0,1,nil,e,1-tp,emg1,nil,chkf)
@@ -124,7 +124,7 @@ function s.gb(e,tp,eg,ep,ev,re,r,rp)
 			Duel.XyzSummon(1-tp,tg:GetFirst(),nil)
 		end
 	elseif sel==3 then
-		local lkg=Duel.GetMatchingGroup(Card.IsLinkSummonable,tp,LOCATION_EXTRA,0,nil,nil)
+		local lkg=Duel.GetMatchingGroup(Card.IsLinkSummonable,1-tp,LOCATION_EXTRA,0,nil,nil)
 		if lkg:GetCount()>0 then
 			Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_SPSUMMON)
 			local sg=lkg:Select(1-tp,1,1,nil)

expansions/script/c31300033.lua

@@ -6,7 +6,6 @@ function s.initial_effect(c)
 	e1:SetCategory(CATEGORY_DAMAGE)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetCountLimit(1,id)
 	e1:SetTarget(s.target)
 	e1:SetOperation(s.activate)
 	c:RegisterEffect(e1)
@@ -16,7 +15,7 @@ function s.initial_effect(c)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
 	e2:SetRange(LOCATION_GRAVE)
 	e2:SetCode(EVENT_REMOVE)
-	e2:SetCountLimit(1,id+1)
+	e2:SetCountLimit(1,id)
 	e2:SetCondition(s.lzcon)
 	e2:SetTarget(s.lztg)
 	e2:SetOperation(s.lzop)

expansions/script/c31300034.lua

@@ -15,6 +15,7 @@ function s.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_HAND)
 	e2:SetCountLimit(1,id)
+	e2:SetCost(s.rmcost)
 	e2:SetTarget(s.rmtg)
 	e2:SetOperation(s.rmop)
 	c:RegisterEffect(e2)
@@ -22,6 +23,11 @@ end
 function s.splimit(e,se,sp,st)
 	return se:IsHasType(EFFECT_TYPE_ACTIONS)
 end
+function s.rmcost(e,tp,eg,ep,ev,re,r,rp,chk)
+	local c=e:GetHandler()
+	if chk==0 then return c:IsDiscardable() end
+	Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
+end
 function s.rmtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToRemove,tp,LOCATION_EXTRA,0,1,nil) end
 	local g=Duel.GetMatchingGroup(Card.IsAbleToRemove,tp,LOCATION_EXTRA,0,nil)
@@ -32,19 +38,18 @@ function s.filter(c,e,tp)
 		and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
 end
 function s.rmop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-	local g=Duel.GetMatchingGroup(Card.IsAbleToRemove,tp,LOCATION_EXTRA,0,nil)
-	if g:GetCount()>0 then
-		local sg=g:RandomSelect(tp,1)
-		Duel.Remove(sg,POS_FACEDOWN,REASON_EFFECT)
 	local sel=0
-		local exg=Duel.GetMatchingGroup(s.filter,tp,LOCATION_EXTRA,0,nil,e,tp)
 	for i=0,5 do
 		if sel==5 then return end
+		local g=Duel.GetMatchingGroup(Card.IsAbleToRemove,tp,LOCATION_EXTRA,0,nil)
+		if g:GetCount()>0 then
+			local sg=g:RandomSelect(tp,1)
+			if Duel.Remove(sg,POS_FACEDOWN,REASON_EFFECT)~=0 then
 				local dg=Duel.GetDecktopGroup(tp,1)
 				Duel.ConfirmDecktop(tp,1)
 				Duel.DisableShuffleCheck()
 				local tc=dg:GetFirst()
+				local exg=Duel.GetMatchingGroup(s.filter,tp,LOCATION_EXTRA,0,nil,e,tp)
 				if tc:IsCode(id) and tc:IsCanBeSpecialSummoned(e,0,tp,false,false) and #exg>0 then
 					sel=5
 					local ec=exg:Select(tp,1,1,nil)
@@ -58,4 +63,5 @@ function s.rmop(e,tp,eg,ep,ev,re,r,rp)
 				end
 			end
 		end
+	end
 end
\ No newline at end of file

expansions/script/c47344578.lua

@@ -8,8 +8,9 @@ function s.initial_effect(c)
 	--counter
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_CHAIN_SOLVED)
+	e1:SetCode(EVENT_CHAINING)
 	e1:SetRange(LOCATION_MZONE)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e1:SetCondition(s.cocon)
 	e1:SetOperation(s.counter)
 	c:RegisterEffect(e1)