Merge branch 'master' into ROTA

c10158145.lua

@@ -87,7 +87,7 @@ function c10158145.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c10158145.splimit(e,c,sump,sumtype,sumpos,targetp)
-	return not c:IsType(TYPE_LINK)
+	return c:GetOriginalType()&TYPE_LINK~=TYPE_LINK
 end
 function c10158145.condition(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsPreviousLocation(LOCATION_ONFIELD) and e:GetHandler():IsPreviousControler(tp)

c10186633.lua

@@ -68,11 +68,14 @@ function c10186633.drop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(c10186633.filter),tp,LOCATION_GRAVE,0,nil)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
 	local sg=g:SelectSubGroup(tp,c10186633.gcheck,false,1,2)
-	if sg and Duel.SendtoDeck(sg,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)>0 then
+	if sg then
+		Duel.HintSelection(sg)
+		if Duel.SendtoDeck(sg,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)>0 then
 			local og=Duel.GetOperatedGroup()
 			if not og:IsExists(Card.IsLocation,1,nil,LOCATION_DECK+LOCATION_EXTRA) then return end
 			Duel.ShuffleDeck(tp)
 			Duel.BreakEffect()
 			Duel.Draw(tp,1,REASON_EFFECT)
 		end
+	end
 end

c10833828.lua

@@ -38,6 +38,7 @@ function c10833828.initial_effect(c)
 	e4:SetOperation(c10833828.damop)
 	c:RegisterEffect(e4)
 end
+c10833828.fusion_effect=true
 function c10833828.spfilter1(c,e,tp)
 	return c:IsSetCard(0x10af) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE)
 end

c11102908.lua

@@ -18,7 +18,7 @@ function c11102908.initial_effect(c)
 end
 function c11102908.atkcon(e)
 	local d=Duel.GetAttackTarget()
-	return Duel.GetCurrentPhase()==PHASE_DAMAGE_CAL and d and d:IsSetCard(0x3d)
+	return Duel.GetCurrentPhase()==PHASE_DAMAGE_CAL and d and d:IsSetCard(0x103d)
 end
 function c11102908.atktg(e,c)
 	return c==Duel.GetAttacker()

c11493868.lua

@@ -28,6 +28,7 @@ function c11493868.initial_effect(c)
 	e3:SetOperation(c11493868.activate)
 	c:RegisterEffect(e3)
 end
+c11493868.fusion_effect=true
 function c11493868.atkfilter(c)
 	return c:IsFaceup() and c:IsSetCard(0x9b)
 end

c11508758.lua

@@ -13,7 +13,7 @@ function c11508758.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c11508758.ctlcon(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetAttackTarget()~=nil
+	return Duel.GetAttackTarget()~=nil and Duel.GetFieldGroupCount(tp,0,LOCATION_MZONE)>=2
 end
 function c11508758.filter(c)
 	return c:IsPosition(POS_FACEUP_ATTACK) and c:IsControlerCanBeChanged() and c:IsAttackable()

c11587414.lua

@@ -30,7 +30,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function s.filter(c)
-	return (c:IsCode(10000010) or aux.IsCodeListed(c,10000010)) and not c:IsCode(id) and c:IsAbleToHand()
+	return aux.IsCodeOrListed(c,10000010) and not c:IsCode(id) and c:IsAbleToHand()
 end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_DECK,0,1,nil) end

c11827244.lua

@@ -10,6 +10,7 @@ function c11827244.initial_effect(c)
 	e1:SetOperation(c11827244.activate)
 	c:RegisterEffect(e1)
 end
+c11827244.fusion_effect=true
 function c11827244.filter0(c)
 	return c:IsOnField() and c:IsAbleToRemove()
 end

c12071500.lua

@@ -10,6 +10,7 @@ function c12071500.initial_effect(c)
 	e1:SetOperation(c12071500.activate)
 	c:RegisterEffect(e1)
 end
+c12071500.fusion_effect=true
 function c12071500.filter0(c)
 	return c:IsLocation(LOCATION_HAND) and c:IsAbleToRemove()
 end

c12266229.lua

@@ -31,7 +31,7 @@ function c12266229.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return not e:GetHandler():IsPublic() end
 end
 function c12266229.thfilter(c)
-	return (c:IsCode(46986414) or aux.IsCodeListed(c,46986414)) and c:IsAbleToHand()
+	return aux.IsCodeOrListed(c,46986414) and c:IsAbleToHand()
 		and c:IsType(TYPE_MONSTER) and not c:IsType(TYPE_RITUAL)
 end
 function c12266229.thtg(e,tp,eg,ep,ev,re,r,rp,chk)

c12289247.lua

@@ -44,6 +44,7 @@ function c12289247.initial_effect(c)
 		Duel.RegisterEffect(ge1,0)
 	end
 end
+c12289247.fusion_effect=true
 c12289247.hnchecks=aux.CreateChecks(Card.IsSetCard,{0x10f2,0x2073,0x2017,0x1046})
 function c12289247.spcfilter(c,tp)
 	return c:IsReason(REASON_BATTLE+REASON_EFFECT)

c12324546.lua

@@ -36,10 +36,10 @@ function c12324546.initial_effect(c)
 	c:RegisterEffect(e5)
 end
 function c12324546.eqlimit(e,c)
-	return c:IsSetCard(0x3d)
+	return c:IsSetCard(0x103d)
 end
 function c12324546.filter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 end
 function c12324546.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c12324546.filter(chkc) end

c12450071.lua

@@ -27,6 +27,7 @@ function c12450071.initial_effect(c)
 	e2:SetOperation(c12450071.spop)
 	c:RegisterEffect(e2)
 end
+c12450071.fusion_effect=true
 function c12450071.filter1(c,e)
 	return not c:IsImmuneToEffect(e)
 end

c1264319.lua

@@ -20,6 +20,7 @@ function c1264319.initial_effect(c)
 	e2:SetOperation(c1264319.thop)
 	c:RegisterEffect(e2)
 end
+c1264319.fusion_effect=true
 function c1264319.filter1(c,e)
 	return not c:IsImmuneToEffect(e)
 end

c13234975.lua

@@ -22,6 +22,7 @@ function c13234975.initial_effect(c)
 	e2:SetOperation(c13234975.thop)
 	c:RegisterEffect(e2)
 end
+c13234975.fusion_effect=true
 function c13234975.filter1(c,e)
 	return not c:IsImmuneToEffect(e)
 end

c13258285.lua

@@ -26,6 +26,7 @@ function c13258285.initial_effect(c)
 	e2:SetOperation(c13258285.scop)
 	c:RegisterEffect(e2)
 end
+c13258285.fusion_effect=true
 function c13258285.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckLPCost(tp,600) end
 	Duel.PayLPCost(tp,600)

c13364097.lua

@@ -52,6 +52,7 @@ function c13364097.operation(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
 	local sg=g:SelectSubGroup(tp,aux.dncheck,false,2,2)
 	if sg then
+		Duel.HintSelection(sg)
 		if Duel.SendtoDeck(sg,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)~=0 and sg:IsExists(Card.IsLocation,1,nil,LOCATION_DECK+LOCATION_EXTRA)
 			and tc:IsRelateToEffect(e) then
 			Duel.Destroy(tc,REASON_EFFECT)

c13650422.lua

@@ -24,7 +24,7 @@ function c13650422.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SendtoGrave(c,REASON_COST+REASON_DISCARD)
 end
 function c13650422.filter(c)
-	return (aux.IsCodeListed(c,94820406) or c:IsCode(94820406)) and not c:IsCode(13650422) and c:IsAbleToHand()
+	return aux.IsCodeOrListed(c,94820406) and not c:IsCode(13650422) and c:IsAbleToHand()
 end
 function c13650422.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c13650422.filter,tp,LOCATION_DECK,0,1,nil) end

c1498130.lua

@@ -16,7 +16,7 @@ function c1498130.tgcon(e,tp,eg,ep,ev,re,r,rp)
 	if not g or g:GetCount()~=1 then return false end
 	local tc=g:GetFirst()
 	local c=e:GetHandler()
-	if tc==c or tc:IsControler(1-tp) or tc:IsFacedown() or not tc:IsLocation(LOCATION_MZONE) or not tc:IsSetCard(0x3d) then return false end
+	if tc==c or tc:IsControler(1-tp) or tc:IsFacedown() or not tc:IsLocation(LOCATION_MZONE) or not tc:IsSetCard(0x103d) then return false end
 	return Duel.CheckChainTarget(ev,c)
 end
 function c1498130.tgop(e,tp,eg,ep,ev,re,r,rp)

c15327215.lua

@@ -26,7 +26,7 @@ function c15327215.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c15327215.cfilter(c,tp)
-	return c:IsFaceup() and c:IsSummonPlayer(tp) and c:IsSetCard(0x103d)
+	return c:IsFaceup() and c:IsSummonPlayer(tp) and c:IsSetCard(0x903d)
 end
 function c15327215.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(c15327215.cfilter,1,nil,tp)
@@ -43,7 +43,7 @@ function c15327215.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c15327215.filter(c,mc)
-	return c:IsLevelBelow(4) and c:IsSetCard(0x3d) and c:IsAbleToRemoveAsCost()
+	return c:IsLevelBelow(4) and c:IsSetCard(0x103d) and c:IsAbleToRemoveAsCost()
 		and not (c:IsLevel(mc:GetLevel()) and c:IsAttribute(mc:GetAttribute()) and c:IsAttack(mc:GetAttack()) and c:IsDefense(mc:GetDefense()))
 end
 function c15327215.cost(e,tp,eg,ep,ev,re,r,rp,chk)

c15543940.lua

@@ -10,6 +10,7 @@ function c15543940.initial_effect(c)
 	e1:SetOperation(c15543940.activate)
 	c:RegisterEffect(e1)
 end
+c15543940.fusion_effect=true
 function c15543940.filter1(c,e)
 	return c:IsOnField() and not c:IsImmuneToEffect(e)
 end

c15939229.lua

@@ -52,6 +52,14 @@ function c15939229.sumsuc(e,tp,eg,ep,ev,re,r,rp)
 	e2:SetReset(RESET_PHASE+PHASE_END)
 	e2:SetLabel(c:GetFieldID())
 	Duel.RegisterEffect(e2,tp)
+	local e3=Effect.CreateEffect(c)
+	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e3:SetCode(EVENT_CHAIN_SOLVING)
+	e3:SetCondition(c15939229.discon)
+	e3:SetOperation(c15939229.disop)
+	e3:SetReset(RESET_PHASE+PHASE_END)
+	e3:SetLabel(c:GetFieldID())
+	Duel.RegisterEffect(e3,tp)
 	c:RegisterFlagEffect(15939229,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1,c:GetFieldID())
 end
 function c15939229.aclimit(e,re,tp)
@@ -61,6 +69,14 @@ end
 function c15939229.disable(e,c)
 	return c:GetFlagEffectLabel(15939229)~=e:GetLabel() and (not c:IsType(TYPE_MONSTER) or (c:IsType(TYPE_EFFECT) or bit.band(c:GetOriginalType(),TYPE_EFFECT)==TYPE_EFFECT))
 end
+function c15939229.discon(e,tp,eg,ep,ev,re,r,rp)
+	local rc=re:GetHandler()
+	local loc=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION)
+	return bit.band(loc,LOCATION_ONFIELD)~=0 and rc:GetFlagEffectLabel(15939229)~=e:GetLabel()
+end
+function c15939229.disop(e,tp,eg,ep,ev,re,r,rp)
+	Duel.NegateEffect(ev)
+end
 function c15939229.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
 	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)

c1683982.lua

@@ -57,14 +57,14 @@ function c1683982.atktg(e,c)
 	return not c:IsRace(RACE_REPTILE)
 end
 function c1683982.cfilter(c,tp)
-	return c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_MZONE)
-		and c:GetPreviousRaceOnField()&RACE_REPTILE~=0 and c:IsPreviousPosition(POS_FACEUP)
+	return c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_MZONE) and c:GetPreviousRaceOnField()&RACE_REPTILE~=0
 end
 function c1683982.regcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(c1683982.cfilter,1,nil,tp)
 end
 function c1683982.cfilter2(c,tp)
-	return not c:IsReason(REASON_BATTLE) and c1683982.cfilter(c,tp)
+	return not c:IsReason(REASON_BATTLE) and c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_MZONE)
+		and c:GetPreviousRaceOnField()&RACE_REPTILE~=0 and c:IsRace(RACE_REPTILE) and c:IsPreviousPosition(POS_FACEUP)
 end
 function c1683982.regcon2(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(c1683982.cfilter2,1,nil,tp)

c17236839.lua

@@ -10,6 +10,7 @@ function c17236839.initial_effect(c)
 	e1:SetOperation(c17236839.activate)
 	c:RegisterEffect(e1)
 end
+c17236839.fusion_effect=true
 function c17236839.filter1(c,e)
 	return c:IsOnField() and not c:IsImmuneToEffect(e)
 end

c1784686.lua

@@ -18,6 +18,7 @@ function c1784686.initial_effect(c)
 	e2:SetValue(10000050)
 	c:RegisterEffect(e2)
 end
+c1784686.fusion_effect=true
 function c1784686.tgfilter(c,e,tp)
 	return c:IsFaceup() and c:IsSetCard(0x10a2) and c:IsCanBeFusionMaterial()
 		and aux.MustMaterialCheck(c,tp,EFFECT_MUST_BE_FMATERIAL)

c1828513.lua

 --六武衆の影－紫炎
 function c1828513.initial_effect(c)
 	--xyz summon
-	aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x3d),4,2)
+	aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsSetCard,0x103d),4,2)
 	c:EnableReviveLimit()
 	--attack up
 	local e1=Effect.CreateEffect(c)
@@ -23,7 +23,7 @@ function c1828513.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
 end
 function c1828513.filter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and c:IsAttackBelow(2000)
+	return c:IsFaceup() and c:IsSetCard(0x103d) and c:IsAttackBelow(2000)
 end
 function c1828513.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and c1828513.filter(chkc) end

c1845204.lua

@@ -11,6 +11,7 @@ function c1845204.initial_effect(c)
 	e1:SetOperation(c1845204.activate)
 	c:RegisterEffect(e1)
 end
+c1845204.fusion_effect=true
 function c1845204.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckLPCost(tp,1000) end
 	Duel.PayLPCost(tp,1000)

c19089195.lua

@@ -106,11 +106,9 @@ function c19089195.remop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 end
 function c19089195.descon(e,tp,eg,ep,ev,re,r,rp)
-	if not c19089195.econ(e,tp,eg,ep,ev,re,r,rp) then return false end
-	local tc=Duel.GetAttacker()
-	local bc=Duel.GetAttackTarget()
-	if not bc then return false end
-	if tc:IsControler(1-tp) then tc,bc=bc,tc end
+	if not Duel.IsEnvironment(22702055) then return false end
+	local tc,bc=Duel.GetBattleMonster(tp)
+	if not tc or not bc then return false end
 	if tc:IsFaceup() and tc:GetOriginalLevel()>=5 and tc:IsAttribute(ATTRIBUTE_WATER) then
 		e:SetLabelObject(bc)
 		return true

c19322865.lua

@@ -39,7 +39,7 @@ function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.filter),tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
 	if #g>0 then
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,g)

c21007444.lua

@@ -11,7 +11,7 @@ function c21007444.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c21007444.filter(c,e,tp)
-	return c:IsSetCard(0x3d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_ATTACK)
+	return c:IsSetCard(0x103d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_ATTACK)
 end
 function c21007444.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_GRAVE) and c21007444.filter(chkc,e,tp) end

c21011044.lua

@@ -18,6 +18,7 @@ function c21011044.initial_effect(c)
 	e1:SetOperation(c21011044.activate)
 	c:RegisterEffect(e1)
 end
+c21011044.fusion_effect=true
 function c21011044.filter0(c)
 	return c:IsOnField() and c:IsAbleToRemove()
 end

c23020408.lua

@@ -23,7 +23,7 @@ function c23020408.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c23020408.filter(c)
-	return (aux.IsCodeListed(c,46986414) or aux.IsCodeListed(c,38033121) or c:IsCode(46986414)) and not c:IsCode(23020408)
+	return (aux.IsCodeOrListed(c,46986414) or aux.IsCodeOrListed(c,38033121)) and not c:IsCode(23020408)
 		and (c:IsAbleToDeck() or c:IsLocation(LOCATION_DECK))
 end
 function c23020408.target(e,tp,eg,ep,ev,re,r,rp,chk)

c23147658.lua

@@ -29,8 +29,7 @@ function c23147658.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c23147658.thfilter(c)
-	if not c:IsAbleToHand() or c:IsCode(23147658) then return false end
-	return c:IsCode(59419719) or aux.IsCodeListed(c,59419719)
+	return aux.IsCodeOrListed(c,59419719) and not c:IsCode(23147658) and c:IsAbleToHand()
 end
 function c23147658.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsReason(REASON_EFFECT)

c23299957.lua

@@ -9,6 +9,7 @@ function c23299957.initial_effect(c)
 	e1:SetOperation(c23299957.activate)
 	c:RegisterEffect(e1)
 end
+c23299957.fusion_effect=true
 function c23299957.filter1(c,e)
 	return not c:IsImmuneToEffect(e)
 end

c24094653.lua

@@ -9,6 +9,7 @@ function c24094653.initial_effect(c)
 	e1:SetOperation(c24094653.activate)
 	c:RegisterEffect(e1)
 end
+c24094653.fusion_effect=true
 function c24094653.filter1(c,e)
 	return not c:IsImmuneToEffect(e)
 end

c24484270.lua

@@ -27,6 +27,7 @@ function c24484270.initial_effect(c)
 	e2:SetOperation(c24484270.spop)
 	c:RegisterEffect(e2)
 end
+c24484270.fusion_effect=true
 function c24484270.thcon(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK)
 end

c2511717.lua

@@ -20,7 +20,7 @@ function c2511717.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c2511717.filter(c,e,tp)
-	return c:IsLevelBelow(4) and c:IsSetCard(0x3d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsLevelBelow(4) and c:IsSetCard(0x103d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c2511717.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
@@ -36,7 +36,7 @@ function c2511717.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c2511717.atkfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and not c:IsCode(2511717)
+	return c:IsFaceup() and c:IsSetCard(0x103d) and not c:IsCode(2511717)
 end
 function c2511717.atkcon(e)
 	local c=e:GetHandler()

c25750986.lua

@@ -36,10 +36,10 @@ function c25750986.activate(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 		local g=Duel.SelectMatchingCard(tp,c25750986.tgfilter,tp,LOCATION_DECK,0,1,1,nil,tp,atk)
 		local gc=g:GetFirst()
+		if gc then
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 			local g1=Duel.SelectMatchingCard(tp,c25750986.tgfilter1,tp,LOCATION_DECK,0,1,1,gc,atk-gc:GetAttack(),gc:GetAttribute())
 			g:Merge(g1)
-		if g:GetCount()>1 then
 			Duel.SendtoGrave(g,REASON_EFFECT)
 		end
 	end

c25800447.lua

@@ -10,6 +10,7 @@ function c25800447.initial_effect(c)
 	e1:SetOperation(c25800447.activate)
 	c:RegisterEffect(e1)
 end
+c25800447.fusion_effect=true
 function c25800447.filter0(c)
 	return c:IsFaceup() and c:IsCanBeFusionMaterial()
 end

c26631975.lua

@@ -22,6 +22,7 @@ function c26631975.initial_effect(c)
 	e2:SetOperation(c26631975.cdop)
 	c:RegisterEffect(e2)
 end
+c26631975.fusion_effect=true
 function c26631975.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2
 end

c26841274.lua

@@ -9,6 +9,7 @@ function c26841274.initial_effect(c)
 	e1:SetOperation(c26841274.activate)
 	c:RegisterEffect(e1)
 end
+c26841274.fusion_effect=true
 function c26841274.filter1(c,e)
 	return c:IsOnField() and c:IsSetCard(0xc008) and (not e or not c:IsImmuneToEffect(e))
 end

c27178262.lua

@@ -12,7 +12,7 @@ function c27178262.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c27178262.costfilter(c,ft)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and c:IsAbleToGraveAsCost() and (ft>0 or c:GetSequence()<5)
+	return c:IsFaceup() and c:IsSetCard(0x103d) and c:IsAbleToGraveAsCost() and (ft>0 or c:GetSequence()<5)
 end
 function c27178262.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
@@ -22,7 +22,7 @@ function c27178262.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SendtoGrave(g,REASON_COST)
 end
 function c27178262.filter(c,e,tp)
-	return c:IsSetCard(0x3d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x103d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c27178262.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and c27178262.filter(chkc,e,tp) end

c27782503.lua

@@ -21,7 +21,7 @@ function c27782503.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c27782503.cfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and not c:IsCode(27782503)
+	return c:IsFaceup() and c:IsSetCard(0x103d) and not c:IsCode(27782503)
 end
 function c27782503.descon(e,tp,eg,ep,ev,re,r,rp)
 	local d=Duel.GetAttackTarget()
@@ -39,7 +39,7 @@ function c27782503.desop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c27782503.repfilter(c,e)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and c:IsDestructable(e) and not c:IsStatus(STATUS_DESTROY_CONFIRMED+STATUS_BATTLE_DESTROYED)
 end
 function c27782503.desreptg(e,tp,eg,ep,ev,re,r,rp,chk)

c27821104.lua

@@ -11,10 +11,10 @@ function c27821104.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c27821104.tfilter(c,atk,code,e,tp)
-	return c:IsSetCard(0x3d) and not c:IsCode(code) and c:IsAttack(atk) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x103d) and not c:IsCode(code) and c:IsAttack(atk) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c27821104.filter(c,e,tp)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and Duel.IsExistingMatchingCard(c27821104.tfilter,tp,LOCATION_DECK,0,1,nil,c:GetAttack(),c:GetCode(),e,tp)
 end
 function c27821104.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)

c27970830.lua

@@ -51,7 +51,7 @@ function c27970830.initial_effect(c)
 end
 c27970830.counter_add_list={0x3}
 function c27970830.ctfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 end
 function c27970830.ctop(e,tp,eg,ep,ev,re,r,rp)
 	if eg:IsExists(c27970830.ctfilter,1,nil) then
@@ -64,7 +64,7 @@ function c27970830.cost1(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RemoveCounter(tp,1,0,0x3,2,REASON_COST)
 end
 function c27970830.filter1(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d,0x20) and c:IsType(TYPE_EFFECT)
+	return c:IsFaceup() and c:IsSetCard(0x103d,0x20) and c:IsType(TYPE_EFFECT)
 end
 function c27970830.tg1(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c27970830.filter1(chkc) end
@@ -90,7 +90,7 @@ function c27970830.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RemoveCounter(tp,1,0,0x3,4,REASON_COST)
 end
 function c27970830.filter2(c)
-	return c:IsType(TYPE_MONSTER) and c:IsSetCard(0x3d) and c:IsAbleToHand()
+	return c:IsType(TYPE_MONSTER) and c:IsSetCard(0x103d) and c:IsAbleToHand()
 end
 function c27970830.tg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chk==0 then return Duel.IsExistingMatchingCard(c27970830.filter2,tp,LOCATION_DECK+LOCATION_GRAVE,0,1,nil) end

c29062925.lua

@@ -11,6 +11,7 @@ function c29062925.initial_effect(c)
 	e1:SetOperation(c29062925.activate)
 	c:RegisterEffect(e1)
 end
+c29062925.fusion_effect=true
 function c29062925.exconfilter(c)
 	return c:IsCode(25652259,64788463,90876561) and c:IsFaceup()
 end

c29143457.lua

@@ -21,6 +21,7 @@ function c29143457.initial_effect(c)
 	e2:SetOperation(c29143457.thop)
 	c:RegisterEffect(e2)
 end
+c29143457.fusion_effect=true
 function c29143457.filter1(c,e)
 	return not c:IsImmuneToEffect(e)
 end

c29177818.lua

@@ -27,7 +27,7 @@ function c29177818.initial_effect(c)
 end
 function c29177818.cfilter(c,tp)
 	return c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousControler(tp) and c:IsPreviousPosition(POS_FACEUP)
-		and bit.band(c:GetPreviousRaceOnField(),RACE_PLANT)>0
+		and bit.band(c:GetPreviousRaceOnField(),RACE_PLANT)>0 and c:IsRace(RACE_PLANT)
 end
 function c29177818.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(c29177818.cfilter,1,nil,tp)

c29280589.lua

@@ -24,6 +24,7 @@ function c29280589.initial_effect(c)
 	e2:SetValue(c29280589.repval)
 	c:RegisterEffect(e2)
 end
+c29280589.fusion_effect=true
 function c29280589.condition(e,tp,eg,ep,ev,re,r,rp)
 	return (Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2) and Duel.GetTurnPlayer()==1-tp
 end

c29719112.lua

@@ -34,6 +34,7 @@ function c29719112.initial_effect(c)
 	e3:SetOperation(c29719112.thop)
 	c:RegisterEffect(e3)
 end
+c29719112.fusion_effect=true
 function c29719112.spfilter(c,tp)
 	return c:IsRace(RACE_MACHINE)
 		and Duel.GetMZoneCount(tp,c)>0 and (c:IsControler(tp) or c:IsFaceup())

c29981921.lua

 --真六武衆－シエン
 function c29981921.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsRace,RACE_WARRIOR),aux.NonTuner(Card.IsSetCard,0x3d),1)
+	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsRace,RACE_WARRIOR),aux.NonTuner(Card.IsSetCard,0x103d),1)
 	c:EnableReviveLimit()
 	--negate
 	local e1=Effect.CreateEffect(c)
@@ -43,7 +43,7 @@ function c29981921.disop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c29981921.repfilter(c,e)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and c:IsDestructable(e) and not c:IsStatus(STATUS_DESTROY_CONFIRMED+STATUS_BATTLE_DESTROYED)
 end
 function c29981921.desreptg(e,tp,eg,ep,ev,re,r,rp,chk)

c30118701.lua

@@ -27,6 +27,7 @@ function c30118701.initial_effect(c)
 	e2:SetOperation(c30118701.spop)
 	c:RegisterEffect(e2)
 end
+c30118701.fusion_effect=true
 function c30118701.hspcfilter(c)
 	return c:IsType(TYPE_MONSTER) and c:IsAbleToGraveAsCost()
 end

c30241314.lua

@@ -14,7 +14,7 @@ function c30241314.initial_effect(c)
 	e2:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetCode(EFFECT_TO_GRAVE_REDIRECT)
-	e2:SetTargetRange(0xff,0xff)
+	e2:SetTargetRange(LOCATION_DECK,LOCATION_DECK)
 	e2:SetValue(LOCATION_REMOVED)
 	c:RegisterEffect(e2)
 end

c3078380.lua

@@ -23,6 +23,7 @@ function c3078380.initial_effect(c)
 	e2:SetOperation(c3078380.fspop)
 	c:RegisterEffect(e2)
 end
+c3078380.fusion_effect=true
 function c3078380.cfilter(c,tp)
 	return (c:IsLocation(LOCATION_HAND) or c:IsFaceup()) and Duel.GetMZoneCount(tp,c)>0 and c:IsAbleToGraveAsCost()
 		and (c:IsRace(RACE_SPELLCASTER) and c:IsType(TYPE_MONSTER) or aux.IsCodeListed(c,46986414) and c:IsType(TYPE_SPELL+TYPE_TRAP))

c31386180.lua

@@ -9,7 +9,7 @@ function c31386180.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
-	e1:SetCondition(c31386180.incon)
+	e1:SetCondition(c31386180.condition)
 	e1:SetValue(1)
 	c:RegisterEffect(e1)
 	--destroy
@@ -21,7 +21,6 @@ function c31386180.initial_effect(c)
 	e2:SetCode(EVENT_PHASE+PHASE_BATTLE)
 	e2:SetCountLimit(1)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetCondition(c31386180.descon)
 	e2:SetTarget(c31386180.destg)
 	e2:SetOperation(c31386180.desop)
 	c:RegisterEffect(e2)
@@ -36,21 +35,18 @@ function c31386180.initial_effect(c)
 	e3:SetOperation(c31386180.rmop)
 	c:RegisterEffect(e3)
 end
-function c31386180.incon(e)
+function c31386180.condition(e)
 	return e:GetHandler():GetOverlayCount()>0
 end
-function c31386180.descon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetBattledGroupCount()>0
-end
 function c31386180.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsControler(1-tp) and chkc:IsOnField() end
 	if chk==0 then return true end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
-	local g=Duel.SelectTarget(tp,aux.TRUE,tp,0,LOCATION_ONFIELD,1,1,nil)
+	local g=Duel.SelectTarget(tp,nil,tp,0,LOCATION_ONFIELD,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,g:GetCount(),0,0)
 end
 function c31386180.desop(e,tp,eg,ep,ev,re,r,rp)
-	if e:GetHandler():GetOverlayCount()==0 then return end
+	if not c31386180.condition(e) then return end
 	local tc=Duel.GetFirstTarget()
 	if tc and tc:IsRelateToEffect(e) and tc:IsControler(1-tp) then
 		Duel.Destroy(tc,REASON_EFFECT)
@@ -60,8 +56,7 @@ function c31386180.rmcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetTurnPlayer()==tp
 end
 function c31386180.rmop(e,tp,eg,ep,ev,re,r,rp)
+	if not c31386180.condition(e) then return end
 	local c=e:GetHandler()
-	if c:GetOverlayCount()>0 then
 	c:RemoveOverlayCard(tp,1,1,REASON_EFFECT)
-	end
 end

c31444249.lua

@@ -33,6 +33,7 @@ function c31444249.initial_effect(c)
 	e4:SetOperation(c31444249.spop)
 	c:RegisterEffect(e4)
 end
+c31444249.fusion_effect=true
 function c31444249.lvtg(e,c)
 	return c:IsSetCard(0xbb) and c:GetOriginalLevel()>=2
 end

c31849106.lua

@@ -12,12 +12,9 @@ function c31849106.activate(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE)
 	e1:SetCode(EFFECT_TO_GRAVE_REDIRECT)
-	e1:SetTarget(c31849106.rmtarget)
-	e1:SetTargetRange(0xff,0xff)
+	e1:SetTarget(aux.DimensionalFissureTarget)
+	e1:SetTargetRange(LOCATION_DECK,LOCATION_DECK)
 	e1:SetValue(LOCATION_REMOVED)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)
 end
-function c31849106.rmtarget(e,c)
-	return not c:IsLocation(0x80) and not c:IsType(TYPE_SPELL+TYPE_TRAP)
-end

c31855260.lua

@@ -12,6 +12,7 @@ function c31855260.initial_effect(c)
 	e1:SetOperation(c31855260.activate)
 	c:RegisterEffect(e1)
 end
+c31855260.fusion_effect=true
 function c31855260.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2
 end

c31887806.lua

@@ -35,6 +35,7 @@ function s.initial_effect(c)
 	e4:SetOperation(s.operation)
 	c:RegisterEffect(e4)
 end
+s.fusion_effect=true
 function s.regop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local e1=Effect.CreateEffect(c)

c31904181.lua

@@ -18,13 +18,13 @@ function c31904181.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c31904181.cfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d) and not c:IsCode(31904181)
+	return c:IsFaceup() and c:IsSetCard(0x103d) and not c:IsCode(31904181)
 end
 function c31904181.dircon(e)
 	return Duel.IsExistingMatchingCard(c31904181.cfilter,e:GetHandler():GetControler(),LOCATION_MZONE,0,1,nil)
 end
 function c31904181.repfilter(c,e)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and c:IsDestructable(e) and not c:IsStatus(STATUS_DESTROY_CONFIRMED+STATUS_BATTLE_DESTROYED)
 end
 function c31904181.desreptg(e,tp,eg,ep,ev,re,r,rp,chk)

c31971040.lua

@@ -23,6 +23,7 @@ function s.afilter(c)
 	return c:IsFaceup() and c:IsSetCard(0x1a3) and c:IsType(TYPE_LINK)
 end
 function s.activate(e,tp,eg,ep,ev,re,r,rp,op)
+	if op==nil and not s.condition(e,tp) then return end
 	local c=e:GetHandler()
 	if op==nil then
 		local chk=Duel.IsExistingMatchingCard(s.afilter,tp,LOCATION_MZONE,0,1,nil)

c32104431.lua

@@ -21,6 +21,7 @@ function c32104431.initial_effect(c)
 	e2:SetOperation(c32104431.fusionop)
 	c:RegisterEffect(e2)
 end
+c32104431.fusion_effect=true
 function c32104431.costfilter(c)
 	return c:IsSetCard(0xd6) and c:IsDiscardable()
 end

c32543380.lua

@@ -16,6 +16,7 @@ function c32543380.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_MUST_ATTACK)
 	e2:SetRange(LOCATION_MZONE)
+	e2:SetCondition(c32543380.bpcon)
 	e2:SetTargetRange(0,LOCATION_MZONE)
 	c:RegisterEffect(e2)
 	local e3=e2:Clone()
@@ -55,6 +56,9 @@ function c32543380.spop(e,tp,eg,ep,ev,re,r,rp,c)
 	local g=e:GetLabelObject()
 	Duel.SendtoGrave(g,REASON_SPSUMMON)
 end
+function c32543380.bpcon(e)
+	return Duel.IsTurnPlayer(1-e:GetHandlerPlayer()) and Duel.IsBattlePhase()
+end
 function c32543380.atklimit(e,c)
 	return c==e:GetHandler()
 end

c32603633.lua

@@ -16,7 +16,7 @@ function c32603633.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.PayLPCost(tp,lp-100)
 end
 function c32603633.filter(c,e,tp)
-	return c:IsSetCard(0x3d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x103d) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 		and not Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,c:GetCode())
 end
 function c32603633.tg(e,tp,eg,ep,ev,re,r,rp,chk)

c32615065.lua

@@ -39,6 +39,7 @@ function c32615065.initial_effect(c)
 	e3:SetOperation(c32615065.spop)
 	c:RegisterEffect(e3)
 end
+c32615065.fusion_effect=true
 function c32615065.ffilter(c)
 	return c:IsRace(RACE_WARRIOR) and c:IsLevelAbove(5)
 end

c33099732.lua

@@ -26,6 +26,7 @@ function s.initial_effect(c)
 	e3:SetOperation(s.fsop)
 	c:RegisterEffect(e3)
 end
+s.fusion_effect=true
 function s.filter(c,tp)
 	return c:IsType(TYPE_FUSION) and Duel.IsExistingMatchingCard(s.sfilter,tp,LOCATION_DECK,0,1,nil,c)
 end

c33550694.lua

@@ -16,6 +16,7 @@ function c33550694.initial_effect(c)
 	e2:SetOperation(c33550694.operation)
 	c:RegisterEffect(e2)
 end
+c33550694.fusion_effect=true
 function c33550694.filter1(c,e)
 	return c:IsAbleToRemove() and not c:IsImmuneToEffect(e)
 end

c33776734.lua

@@ -49,6 +49,7 @@ function c33776734.initial_effect(c)
 	end
 end
 c33776734.lvup={33776734}
+c33776734.lvdn={48486809}
 function c33776734.checkop1(e,tp,eg,ep,ev,re,r,rp)
 	if re and re:IsHasType(EFFECT_TYPE_ACTIVATE) and re:IsActiveType(TYPE_SPELL) then
 		re:GetHandler():RegisterFlagEffect(33776734,RESET_EVENT+RESETS_STANDARD,0,1)

c33883834.lua

@@ -15,7 +15,7 @@ end
 function c33883834.con(e,tp,eg,ep,ev,re,r,rp)
 	local a=Duel.GetAttacker()
 	local d=Duel.GetAttackTarget()
-	return d and ((a:IsControler(tp) and a:IsSetCard(0x3d)) or (d:IsControler(tp) and d:IsSetCard(0x3d)))
+	return d and ((a:IsControler(tp) and a:IsSetCard(0x103d)) or (d:IsControler(tp) and d:IsSetCard(0x103d)))
 		and Duel.GetFlagEffect(tp,33883834)==0
 end
 function c33883834.cost(e,tp,eg,ep,ev,re,r,rp,chk)

c33964637.lua

@@ -43,10 +43,10 @@ function c33964637.splimit(e,se,sp,st)
 	return not e:GetHandler():IsLocation(LOCATION_EXTRA)
 end
 function c33964637.ffilter(c,fc,sub,mg,sg)
-	return c:IsFusionSetCard(0x3d) and (not sg or not sg:IsExists(Card.IsFusionAttribute,1,c,c:GetFusionAttribute()))
+	return c:IsFusionSetCard(0x103d) and (not sg or not sg:IsExists(Card.IsFusionAttribute,1,c,c:GetFusionAttribute()))
 end
 function c33964637.costfilter(c,tp)
-	return c:IsSetCard(0x3d) and c:IsAbleToRemoveAsCost() and (c:IsLocation(LOCATION_HAND) or c:IsFaceup())
+	return c:IsSetCard(0x103d) and c:IsAbleToRemoveAsCost() and (c:IsLocation(LOCATION_HAND) or c:IsFaceup())
 		and Duel.IsExistingTarget(Card.IsAbleToRemove,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,c)
 end
 function c33964637.rmcost(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -70,7 +70,7 @@ function c33964637.rmop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c33964637.repfilter(c,tp)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 		and c:IsLocation(LOCATION_MZONE) and c:IsControler(tp) and c:IsReason(REASON_EFFECT+REASON_BATTLE) and not c:IsReason(REASON_REPLACE)
 end
 function c33964637.reptg(e,tp,eg,ep,ev,re,r,rp,chk)

c34325937.lua

@@ -23,6 +23,7 @@ function c34325937.initial_effect(c)
 	e2:SetOperation(c34325937.spop)
 	c:RegisterEffect(e2)
 end
+c34325937.fusion_effect=true
 function c34325937.filter1(c,e)
 	return not c:IsImmuneToEffect(e)
 end

c34690953.lua

@@ -33,7 +33,7 @@ function c34690953.initial_effect(c)
 	Duel.AddCustomActivityCounter(34690953,ACTIVITY_SPSUMMON,c34690953.counterfilter)
 end
 function c34690953.counterfilter(c)
-	return aux.IsCodeListed(c,3285552) or c:IsCode(3285552)
+	return aux.IsCodeOrListed(c,3285552)
 end
 function c34690953.tkcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetCustomActivityCount(34690953,tp,ACTIVITY_SPSUMMON)==0 end

c34813545.lua

@@ -28,6 +28,7 @@ function c34813545.initial_effect(c)
 	e3:SetOperation(c34813545.fsop)
 	c:RegisterEffect(e3)
 end
+c34813545.fusion_effect=true
 function c34813545.spfilter(c,e,tp)
 	return c:IsSetCard(0x2a) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end

c34933456.lua

@@ -10,6 +10,7 @@ function c34933456.initial_effect(c)
 	e1:SetOperation(c34933456.activate)
 	c:RegisterEffect(e1)
 end
+c34933456.fusion_effect=true
 function c34933456.mttg(e,c)
 	local tc=c:GetEquipTarget()
 	return tc and tc:IsSetCard(0x150) and c:GetOriginalType()&TYPE_MONSTER~=0

c34995106.lua

@@ -31,6 +31,7 @@ function c34995106.initial_effect(c)
 	e3:SetOperation(c34995106.setop)
 	c:RegisterEffect(e3)
 end
+c34995106.fusion_effect=true
 function c34995106.filter1(c,e)
 	return c:IsType(TYPE_MONSTER) and c:IsAbleToRemove() and c:IsCanBeFusionMaterial() and not c:IsImmuneToEffect(e)
 end

c35098357.lua

@@ -21,6 +21,7 @@ function c35098357.initial_effect(c)
 	e2:SetOperation(c35098357.thop)
 	c:RegisterEffect(e2)
 end
+c35098357.fusion_effect=true
 function c35098357.filter1(c,e)
 	return not c:IsImmuneToEffect(e)
 end

c35705817.lua

@@ -10,6 +10,7 @@ function c35705817.initial_effect(c)
 	e1:SetOperation(c35705817.activate)
 	c:RegisterEffect(e1)
 end
+c35705817.fusion_effect=true
 function c35705817.filter0(c)
 	return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove() and c:IsRace(RACE_ZOMBIE)
 end

c36328300.lua

@@ -22,6 +22,7 @@ function c36328300.initial_effect(c)
 	e2:SetOperation(c36328300.plop)
 	c:RegisterEffect(e2)
 end
+c36328300.fusion_effect=true
 function c36328300.confilter(c,tp)
 	return c:IsPreviousSetCard(0x1034) and c:IsPreviousControler(tp)
 end

c36484016.lua

@@ -20,6 +20,7 @@ function c36484016.initial_effect(c)
 	e2:SetOperation(c36484016.drop)
 	c:RegisterEffect(e2)
 end
+c36484016.fusion_effect=true
 function c36484016.filter0(c)
 	return c:IsOnField() and c:IsAbleToRemove()
 end

c3659803.lua

@@ -9,6 +9,7 @@ function c3659803.initial_effect(c)
 	e1:SetOperation(c3659803.activate)
 	c:RegisterEffect(e1)
 end
+c3659803.fusion_effect=true
 function c3659803.filter0(c)
 	return c:IsOnField() and c:IsAbleToRemove()
 end

c37520316.lua

@@ -22,7 +22,7 @@ function c37520316.activate(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) and Duel.GetControl(tc,tp,PHASE_END,1)~=0 then
 		local e1=Effect.CreateEffect(c)
-		local reset=RESET_EVENT+RESETS_STANDARD-RESET_TURN_SET+RESET_PHASE+PHASE_END
+		local reset=RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetCode(EFFECT_UNRELEASABLE_SUM)
 		e1:SetReset(reset)

c37630732.lua

@@ -9,6 +9,7 @@ function c37630732.initial_effect(c)
 	e1:SetOperation(c37630732.activate)
 	c:RegisterEffect(e1)
 end
+c37630732.fusion_effect=true
 function c37630732.filter1(c,e)
 	return not c:IsImmuneToEffect(e)
 end

c37961969.lua

@@ -25,6 +25,7 @@ function c37961969.initial_effect(c)
 	e2:SetOperation(c37961969.activate)
 	c:RegisterEffect(e2)
 end
+c37961969.fusion_effect=true
 function c37961969.tgcon(e,tp,eg,ep,ev,re,r,rp)
 	return rp==1-tp and re:IsActiveType(TYPE_MONSTER) and re:GetActivateLocation()==LOCATION_MZONE
 end

c38280762.lua

@@ -32,7 +32,7 @@ function c38280762.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c38280762.spfilter(c)
-	return c:IsSetCard(0x3d) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemoveAsCost()
+	return c:IsSetCard(0x103d) and c:IsType(TYPE_MONSTER) and c:IsAbleToRemoveAsCost()
 end
 function c38280762.spcon(e,c)
 	if c==nil then return true end

c38590361.lua

@@ -10,6 +10,7 @@ function c38590361.initial_effect(c)
 	e1:SetOperation(c38590361.activate)
 	c:RegisterEffect(e1)
 end
+c38590361.fusion_effect=true
 function c38590361.filter1(c,e)
 	return not c:IsImmuneToEffect(e)
 end

c39261576.lua

@@ -23,6 +23,7 @@ function c39261576.initial_effect(c)
 	e2:SetLabelObject(e1)
 	c:RegisterEffect(e2)
 end
+c39261576.fusion_effect=true
 function c39261576.filter1(c,e)
 	return c:IsOnField() and not c:IsImmuneToEffect(e)
 end

c39396763.lua

@@ -23,6 +23,7 @@ function s.initial_effect(c)
 	e2:SetOperation(s.fusop)
 	c:RegisterEffect(e2)
 end
+s.fusion_effect=true
 function s.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetLP(tp)<Duel.GetLP(1-tp)
 end

c39564736.lua

@@ -10,6 +10,7 @@ function c39564736.initial_effect(c)
 	e1:SetOperation(c39564736.activate)
 	c:RegisterEffect(e1)
 end
+c39564736.fusion_effect=true
 function c39564736.filter1(c,e)
 	return not c:IsImmuneToEffect(e)
 end

c39733924.lua

@@ -18,7 +18,7 @@ function s.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetRange(LOCATION_GRAVE)
-	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
+	e2:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
 	e2:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE)
 	e2:SetCost(aux.bfgcost)
 	e2:SetTarget(s.eqtg)

c40003819.lua

@@ -10,6 +10,7 @@ function c40003819.initial_effect(c)
 	e1:SetOperation(c40003819.activate)
 	c:RegisterEffect(e1)
 end
+c40003819.fusion_effect=true
 function c40003819.filter0(c)
 	return c:IsOnField() and c:IsType(TYPE_LINK) and c:IsAbleToRemove()
 end

c40110009.lua

@@ -21,6 +21,7 @@ function c40110009.initial_effect(c)
 	e2:SetOperation(c40110009.thop)
 	c:RegisterEffect(e2)
 end
+c40110009.fusion_effect=true
 function c40110009.filter1(c,e)
 	return not c:IsImmuneToEffect(e)
 end

c40597694.lua

@@ -23,6 +23,7 @@ function c40597694.initial_effect(c)
 	e3:SetOperation(c40597694.desop)
 	c:RegisterEffect(e3)
 end
+c40597694.fusion_effect=true
 function c40597694.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetFieldGroupCount(tp,0,LOCATION_MZONE)>0
 end

c41458579.lua

@@ -12,7 +12,7 @@ function c41458579.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c41458579.filter(c)
-	return c:IsFaceup() and c:IsSetCard(0x3d)
+	return c:IsFaceup() and c:IsSetCard(0x103d)
 end
 function c41458579.condition(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.IsExistingMatchingCard(c41458579.filter,tp,LOCATION_MZONE,0,1,nil) then return false end

c41940225.lua

@@ -22,6 +22,7 @@ function c41940225.initial_effect(c)
 	e2:SetOperation(c41940225.thop)
 	c:RegisterEffect(e2)
 end
+c41940225.fusion_effect=true
 function c41940225.filter0(c)
 	return c:IsFaceup() and c:IsCanBeFusionMaterial()
 end

c42002073.lua

@@ -22,6 +22,7 @@ function c42002073.initial_effect(c)
 	e6:SetOperation(c42002073.spop)
 	c:RegisterEffect(e6)
 end
+c42002073.fusion_effect=true
 function c42002073.filter1(c,e)
 	return c:IsOnField() and not c:IsImmuneToEffect(e)
 end

c42577802.lua

@@ -11,6 +11,7 @@ function c42577802.initial_effect(c)
 	c:RegisterEffect(e1)
 	Duel.AddCustomActivityCounter(42577802,ACTIVITY_CHAIN,aux.FALSE)
 end
+c42577802.fusion_effect=true
 function c42577802.filter0(c)
 	return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToRemove()
 end

c42878636.lua

@@ -31,6 +31,7 @@ function c42878636.initial_effect(c)
 	e3:SetOperation(c42878636.spop)
 	c:RegisterEffect(e3)
 end
+c42878636.fusion_effect=true
 function c42878636.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.SetTargetPlayer(1-tp)

c43618262.lua

@@ -20,9 +20,9 @@ function c43618262.cfop(e,tp,eg,ep,ev,re,r,rp)
 	if g:FilterCount(Card.IsAbleToHand,nil,tp)==0 then return end
 	Duel.ConfirmDecktop(1-p,5)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	Duel.PreserveSelectDeckSequence(true)
+	Duel.RevealSelectDeckSequence(true)
 	local tc=g:FilterSelect(tp,Card.IsAbleToHand,1,1,nil,tp):GetFirst()
-	Duel.PreserveSelectDeckSequence(false)
+	Duel.RevealSelectDeckSequence(false)
 	local num=math.floor(3000/100)
 	local t={}
 	for i=1,num do

c43698897.lua

@@ -26,6 +26,7 @@ function c43698897.initial_effect(c)
 	e3:SetOperation(c43698897.thop)
 	c:RegisterEffect(e3)
 end
+c43698897.fusion_effect=true
 function c43698897.spfilter(c)
 	return c:IsSetCard(0x46) and c:IsType(TYPE_SPELL) and c:IsAbleToRemoveAsCost()
 end

c44227727.lua

@@ -22,6 +22,7 @@ function c44227727.initial_effect(c)
 	e2:SetOperation(c44227727.eqop)
 	c:RegisterEffect(e2)
 end
+c44227727.fusion_effect=true
 function c44227727.filter1(c,e)
 	return not c:IsImmuneToEffect(e)
 end