Merge branch 'develop' into develop-8888

c10833828.lua

@@ -39,7 +39,6 @@ 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

c11493868.lua

@@ -29,7 +29,6 @@ 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

c11827244.lua

@@ -11,7 +11,6 @@ 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

@@ -11,7 +11,6 @@ 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

c12289247.lua

@@ -45,7 +45,6 @@ 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)

c12450071.lua

@@ -28,7 +28,6 @@ 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

c126218.lua

@@ -3,7 +3,7 @@
 function c126218.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_ATKCHANGE)
+	e1:SetCategory(CATEGORY_DICE+CATEGORY_ATKCHANGE)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP)
 	e1:SetCode(EVENT_FREE_CHAIN)

c1264319.lua

@@ -21,7 +21,6 @@ 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

c12686296.lua

@@ -52,7 +52,7 @@ end
 function s.coinop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local res=-1
-	if c:IsHasEffect(73206827) then
+	if Duel.IsPlayerAffectedByEffect(tp,73206827) then
 		local b1=Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_DECK+LOCATION_HAND,0,1,nil,e,tp)
 		local b2=Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil)
 		if b1 and not b2 then

c13234975.lua

@@ -23,7 +23,6 @@ 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

@@ -27,7 +27,6 @@ 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)

c15521027.lua

@@ -16,7 +16,7 @@ function c15521027.initial_effect(c)
 	--tohand
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(15521027,1))
-	e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	e2:SetCategory(CATEGORY_DICE+CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1)
@@ -27,6 +27,7 @@ function c15521027.initial_effect(c)
 	--sort deck
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(15521027,2))
+	e3:SetCategory(CATEGORY_DICE)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCountLimit(1)

c15543940.lua

@@ -11,7 +11,6 @@ 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

c17236839.lua

@@ -11,7 +11,6 @@ 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

@@ -19,7 +19,6 @@ 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)

c1845204.lua

@@ -12,7 +12,6 @@ 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)

c18843291.lua

@@ -21,15 +21,16 @@ function s.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_CANNOT_REMOVE)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CANNOT_DISABLE)
+	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e2:SetTargetRange(1,1)
 	e2:SetTarget(s.efilter)
+	c:RegisterEffect(e2)
 	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_GRANT)
+	e3:SetType(EFFECT_TYPE_FIELD)
+	e3:SetCode(id)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetTargetRange(LOCATION_MZONE,0)
 	e3:SetTarget(s.eftg)
-	e3:SetLabelObject(e2)
 	c:RegisterEffect(e3)
 	--remove and tograve
 	local e4=Effect.CreateEffect(c)
@@ -64,7 +65,7 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.efilter(e,c,rp,r,re)
-	return c==e:GetHandler() and r&REASON_EFFECT>0
+	return c:IsHasEffect(id) and r&REASON_EFFECT>0
 end
 function s.eftg(e,c)
 	return c:IsSetCard(0x38) and c:IsFaceup()

c19652159.lua

@@ -68,7 +68,6 @@ function s.negop(e,tp,eg,ep,ev,re,r,rp)
 	end
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_COPY_INHERIT)
 	e1:SetCode(EFFECT_UPDATE_ATTACK)
 	e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE)
 	e1:SetValue(-1000)

c21011044.lua

@@ -19,7 +19,6 @@ 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

c23299957.lua

@@ -10,7 +10,6 @@ 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

c23846921.lua

@@ -3,8 +3,6 @@
 function c23846921.initial_effect(c)
 	--coin
 	aux.EnableArcanaCoin(c,EVENT_SUMMON_SUCCESS,EVENT_FLIP_SUMMON_SUCCESS,EVENT_SPSUMMON_SUCCESS)
-end
-function c23846921.arcanareg(c,coin)
 	--coin effect
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(23846921,1))
@@ -16,7 +14,6 @@ function c23846921.arcanareg(c,coin)
 	e1:SetCost(c23846921.skipcost)
 	e1:SetTarget(c23846921.skiptg)
 	e1:SetOperation(c23846921.skipop)
-	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 	c:RegisterEffect(e1)
 	--
 	local e2=Effect.CreateEffect(c)
@@ -29,9 +26,7 @@ function c23846921.arcanareg(c,coin)
 	e2:SetCondition(c23846921.thcon)
 	e2:SetTarget(c23846921.thtg)
 	e2:SetOperation(c23846921.thop)
-	e2:SetReset(RESET_EVENT+RESETS_STANDARD)
 	c:RegisterEffect(e2)
-	c:RegisterFlagEffect(FLAG_ID_ARCANA_COIN,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,coin,63-coin)
 end
 function c23846921.skipcon(e,tp,eg,ep,ev,re,r,rp)
 	return ep==tp and e:GetHandler():GetFlagEffectLabel(FLAG_ID_ARCANA_COIN)==1

c24094653.lua

@@ -10,7 +10,6 @@ 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

@@ -28,7 +28,6 @@ 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

c24643913.lua

@@ -51,7 +51,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e8)
 end
 function s.quick_filter(e)
-	return e:GetCode()==EVENT_CHAINING and e:IsHasType(EFFECT_TYPE_QUICK_O) and e:IsHasRange(LOCATION_HAND+LOCATION_MZONE)
+	return e:GetCode()==EVENT_CHAINING and e:IsHasType(EFFECT_TYPE_QUICK_O+EFFECT_TYPE_QUICK_F) and e:IsHasRange(LOCATION_HAND+LOCATION_MZONE)
 end
 function s.cfilter(c)
 	return c:IsOriginalEffectProperty(s.quick_filter) and c:GetOriginalType()&TYPE_MONSTER==TYPE_MONSTER and c:IsFaceupEx()

c25131968.lua

@@ -15,9 +15,8 @@ function s.initial_effect(c)
 	--spsummon
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(id,1))
-	e2:SetCategory(CATEGORY_TOHAND)
+	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_IGNITION)
-	e2:SetCode(EVENT_PHASE+PHASE_BATTLE)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1,id)
 	e2:SetTarget(s.sptg)

c25800447.lua

@@ -11,7 +11,6 @@ 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

@@ -23,7 +23,6 @@ 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

@@ -10,7 +10,6 @@ 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

c29062925.lua

@@ -12,7 +12,6 @@ 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

@@ -22,7 +22,6 @@ 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

c29280589.lua

@@ -25,7 +25,6 @@ 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

@@ -35,7 +35,6 @@ 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())

c29913783.lua

@@ -83,7 +83,7 @@ function c29913783.spcon2(e,tp,eg,ep,ev,re,r,rp)
 	return tp==Duel.GetTurnPlayer()
 end
 function c29913783.sptg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
+	if chk==0 then return e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 end
 function c29913783.spop2(e,tp,eg,ep,ev,re,r,rp)

c30118701.lua

@@ -28,7 +28,6 @@ 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

c30439101.lua

@@ -56,10 +56,10 @@ function c30439101.discon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(c30439101.cfilter,1,nil,tp)
 end
 function c30439101.distg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and aux.NegateMonsterFilter(chkc) end
-	if chk==0 then return Duel.IsExistingTarget(aux.NegateMonsterFilter,tp,0,LOCATION_MZONE,1,nil) end
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and chkc:IsFaceup() end
+	if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISABLE)
-	local g=Duel.SelectTarget(tp,aux.NegateMonsterFilter,tp,0,LOCATION_MZONE,1,1,nil)
+	local g=Duel.SelectTarget(tp,Card.IsFaceup,tp,0,LOCATION_MZONE,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_DISABLE,g,1,0,0)
 end
 function c30439101.disop(e,tp,eg,ep,ev,re,r,rp)

c3078380.lua

@@ -24,7 +24,6 @@ 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))

c31444249.lua

@@ -34,7 +34,6 @@ 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

c31855260.lua

@@ -13,7 +13,6 @@ 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

c31863912.lua

@@ -3,6 +3,7 @@
 function c31863912.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
+	e1:SetCategory(CATEGORY_DICE+CATEGORY_TOHAND)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetHintTiming(0,TIMING_SPSUMMON)
@@ -12,6 +13,7 @@ function c31863912.initial_effect(c)
 	--
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(31863912,0))
+	e1:SetCategory(CATEGORY_DICE+CATEGORY_TOHAND)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e2:SetRange(LOCATION_SZONE)

c31887806.lua

@@ -36,7 +36,6 @@ 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)

c32104431.lua

@@ -22,7 +22,6 @@ 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

c32615065.lua

@@ -40,7 +40,6 @@ 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

@@ -27,7 +27,6 @@ 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

c33114323.lua

@@ -14,6 +14,7 @@ function c33114323.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
+	e2:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetTargetRange(0x34,0x34)
 	e2:SetCondition(c33114323.effcon)

c33206889.lua

@@ -64,7 +64,6 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp)
 	if tc:IsRelateToEffect(e) and tc:IsFaceup() and tc:IsControler(1-tp) then
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetProperty(EFFECT_FLAG_COPY_INHERIT)
 		e1:SetCode(EFFECT_UPDATE_ATTACK)
 		e1:SetValue(-600)
 		e1:SetReset(RESET_EVENT+RESETS_STANDARD)

c33550694.lua

@@ -17,7 +17,6 @@ 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

c3376703.lua

@@ -106,7 +106,7 @@ end
 function s.coinop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local res=-1
-	if c:IsHasEffect(73206827) then
+	if Duel.IsPlayerAffectedByEffect(tp,73206827) then
 		local b1=Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_DECK,0,1,nil,e,tp)
 		local b2=Duel.GetLocationCount(1-tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(s.spfilter2,tp,LOCATION_DECK,0,1,nil,e,tp)
 		if b1 and not b2 then

c34325937.lua

@@ -24,7 +24,6 @@ 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

c34568403.lua

@@ -16,12 +16,22 @@ function c34568403.initial_effect(c)
 	local e3=e1:Clone()
 	e3:SetCode(EVENT_FLIP_SUMMON_SUCCESS)
 	c:RegisterEffect(e3)
+	--coin effect
+	local e4=Effect.CreateEffect(c)
+	e4:SetDescription(aux.Stringid(34568403,1))
+	e4:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e4:SetCode(EVENT_BATTLE_DESTROYING)
+	e4:SetCondition(c34568403.spcon)
+	e4:SetTarget(c34568403.sptg)
+	e4:SetOperation(c34568403.spop)
+	c:RegisterEffect(e4)
 end
 function c34568403.coinop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local res=0
 	local toss=false
-	if c:IsHasEffect(73206827) then
+	if Duel.IsPlayerAffectedByEffect(tp,73206827) then
 		res=1-Duel.SelectOption(tp,60,61)
 	else
 		res=Duel.TossCoin(tp,1)
@@ -31,25 +41,11 @@ function c34568403.coinop(e,tp,eg,ep,ev,re,r,rp)
 	if toss then
 		c:RegisterFlagEffect(FLAG_ID_REVERSAL_OF_FATE,RESET_EVENT+RESETS_STANDARD,0,1)
 	end
-	c34568403.arcanareg(c,res)
+	c:RegisterFlagEffect(FLAG_ID_ARCANA_COIN,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,res,63-res)
 	if res==0 then
 		Duel.GetControl(c,1-tp)
 	end
 end
-function c34568403.arcanareg(c,coin)
-	--coin effect
-	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(34568403,1))
-	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e1:SetCode(EVENT_BATTLE_DESTROYING)
-	e1:SetCondition(c34568403.spcon)
-	e1:SetTarget(c34568403.sptg)
-	e1:SetOperation(c34568403.spop)
-	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
-	c:RegisterEffect(e1)
-	c:RegisterFlagEffect(FLAG_ID_ARCANA_COIN,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,coin,63-coin)
-end
 function c34568403.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	return c:GetFlagEffectLabel(FLAG_ID_ARCANA_COIN)==1 and c:IsRelateToBattle() and c:IsStatus(STATUS_OPPO_BATTLE)

c34813545.lua

@@ -29,7 +29,6 @@ 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

@@ -11,7 +11,6 @@ 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

@@ -32,7 +32,6 @@ 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

@@ -22,7 +22,6 @@ 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

@@ -11,7 +11,6 @@ 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

c35781051.lua

@@ -3,8 +3,6 @@
 function c35781051.initial_effect(c)
 	--coin
 	aux.EnableArcanaCoin(c,EVENT_SUMMON_SUCCESS,EVENT_FLIP_SUMMON_SUCCESS,EVENT_SPSUMMON_SUCCESS)
-end
-function c35781051.arcanareg(c,coin)
 	--coin effect
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(35781051,1))
@@ -15,7 +13,6 @@ function c35781051.arcanareg(c,coin)
 	e1:SetCondition(c35781051.spcon)
 	e1:SetTarget(c35781051.sptg)
 	e1:SetOperation(c35781051.spop)
-	e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 	c:RegisterEffect(e1)
 	local e2=e1:Clone()
 	e2:SetCode(EVENT_MSET)
@@ -30,12 +27,10 @@ function c35781051.arcanareg(c,coin)
 	e3:SetCondition(c35781051.tgcon)
 	e3:SetTarget(c35781051.tgtg)
 	e3:SetOperation(c35781051.tgop)
-	e3:SetReset(RESET_EVENT+RESETS_STANDARD)
 	c:RegisterEffect(e3)
 	local e4=e3:Clone()
 	e4:SetCode(EVENT_MSET)
 	c:RegisterEffect(e4)
-	c:RegisterFlagEffect(FLAG_ID_ARCANA_COIN,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,coin,63-coin)
 end
 function c35781051.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return ep~=tp and e:GetHandler():GetFlagEffectLabel(FLAG_ID_ARCANA_COIN)==1

c35798491.lua

@@ -14,6 +14,7 @@ function c35798491.initial_effect(c)
 	--disable and destroy
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e2:SetCategory(CATEGORY_DICE)
 	e2:SetCode(EVENT_CHAIN_SOLVING)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetOperation(c35798491.disop)

c35975813.lua

@@ -23,6 +23,7 @@ function c35975813.initial_effect(c)
 	--disable and destroy
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e4:SetCategory(CATEGORY_DICE)
 	e4:SetCode(EVENT_CHAIN_SOLVING)
 	e4:SetRange(LOCATION_MZONE)
 	e4:SetOperation(c35975813.disop)

c36328300.lua

@@ -23,7 +23,6 @@ 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

@@ -21,7 +21,6 @@ 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

@@ -10,7 +10,6 @@ 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

c37630732.lua

@@ -10,7 +10,6 @@ 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

@@ -26,7 +26,6 @@ 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

c38299233.lua

@@ -10,7 +10,7 @@ function c38299233.initial_effect(c)
 	--roll and destroy
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(38299233,0))
-	e2:SetCategory(CATEGORY_DESTROY)
+	e2:SetCategory(CATEGORY_DICE+CATEGORY_DESTROY)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetCountLimit(1)

c38590361.lua

@@ -11,7 +11,6 @@ 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

@@ -24,7 +24,6 @@ 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

@@ -24,7 +24,6 @@ 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

@@ -11,7 +11,6 @@ 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

c39761418.lua

@@ -60,7 +60,7 @@ end
 function s.coinop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local res=-1
-	if c:IsHasEffect(73206827) then
+	if Duel.IsPlayerAffectedByEffect(tp,73206827) then
 		local b1=Duel.IsExistingMatchingCard(s.setfilter,tp,LOCATION_DECK,0,1,nil)
 		local b2=Duel.IsExistingMatchingCard(s.desfilter,tp,LOCATION_SZONE,LOCATION_SZONE,1,nil)
 		if b1 and not b2 then

c40003819.lua

@@ -11,7 +11,6 @@ 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

@@ -22,7 +22,6 @@ 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

c40364916.lua

@@ -20,7 +20,7 @@ function c40364916.initial_effect(c)
 	--remove
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(40364916,1))
-	e4:SetCategory(CATEGORY_REMOVE+CATEGORY_TOGRAVE)
+	e4:SetCategory(CATEGORY_REMOVE+CATEGORY_TOGRAVE+CATEGORY_DECKDES)
 	e4:SetType(EFFECT_TYPE_IGNITION)
 	e4:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e4:SetRange(LOCATION_SZONE)
@@ -69,6 +69,7 @@ function c40364916.rmop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetMatchingGroup(c40364916.tgfilter,tp,LOCATION_DECK,0,nil)
 	if tc:IsRelateToEffect(e) and Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)~=0
 		and g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(40364916,2)) then
+		Duel.BreakEffect()
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 		local sg=g:Select(tp,1,1,nil)
 		Duel.SendtoGrave(sg,REASON_EFFECT)

c40597694.lua

@@ -24,7 +24,6 @@ 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

c40939228.lua

@@ -110,18 +110,20 @@ end
 function c40939228.negop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local fid=c:GetFieldID()
-	if c:IsRelateToEffect(e) and Duel.Remove(c,0,REASON_EFFECT+REASON_TEMPORARY)~=0 and c:GetOriginalCode()==id then
-		c:RegisterFlagEffect(40939228,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1,fid)
-		local e1=Effect.CreateEffect(c)
-		e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-		e1:SetCode(EVENT_PHASE+PHASE_END)
-		e1:SetReset(RESET_PHASE+PHASE_END)
-		e1:SetLabel(fid)
-		e1:SetLabelObject(c)
-		e1:SetCountLimit(1)
-		e1:SetCondition(c40939228.retcon)
-		e1:SetOperation(c40939228.retop)
-		Duel.RegisterEffect(e1,tp)
+	if c:IsRelateToEffect(e) and Duel.Remove(c,0,REASON_EFFECT+REASON_TEMPORARY)~=0 then
+		if c:GetOriginalCode()==id then
+			c:RegisterFlagEffect(40939228,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1,fid)
+			local e1=Effect.CreateEffect(c)
+			e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+			e1:SetCode(EVENT_PHASE+PHASE_END)
+			e1:SetReset(RESET_PHASE+PHASE_END)
+			e1:SetLabel(fid)
+			e1:SetLabelObject(c)
+			e1:SetCountLimit(1)
+			e1:SetCondition(c40939228.retcon)
+			e1:SetOperation(c40939228.retop)
+			Duel.RegisterEffect(e1,tp)
+		end
 		if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) then
 			Duel.Remove(eg,POS_FACEUP,REASON_EFFECT)
 		end

c41940225.lua

@@ -23,7 +23,6 @@ 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

@@ -23,7 +23,6 @@ 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

@@ -12,7 +12,6 @@ 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

@@ -32,7 +32,6 @@ 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)

c43698897.lua

@@ -27,7 +27,6 @@ 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

@@ -23,7 +23,6 @@ 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

c44362883.lua

@@ -14,7 +14,6 @@ function c44362883.initial_effect(c)
 	c:RegisterEffect(e1)
 	Duel.AddCustomActivityCounter(44362883,ACTIVITY_SPSUMMON,c44362883.counterfilter)
 end
-c44362883.fusion_effect=true
 function c44362883.counterfilter(c)
 	return not c:IsSummonLocation(LOCATION_EXTRA) or c:IsType(TYPE_FUSION)
 end

c44394295.lua

@@ -11,7 +11,6 @@ function c44394295.initial_effect(c)
 	e1:SetOperation(c44394295.activate)
 	c:RegisterEffect(e1)
 end
-c44394295.fusion_effect=true
 function c44394295.filter0(c)
 	return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToGrave()
 end

c44771289.lua

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

c45112597.lua

@@ -87,7 +87,7 @@ function c45112597.rmop(e,tp,eg,ep,ev,re,r,rp)
 			Duel.SpecialSummonComplete()
 			local cg=spg:Filter(Card.IsFacedown,nil)
 			if #cg>0 then
-				Duel.ConfirmCards(1-tp,g)
+				Duel.ConfirmCards(1-tp,cg)
 			end
 		end
 	end

c45206713.lua

@@ -21,7 +21,6 @@ function c45206713.initial_effect(c)
 	e2:SetOperation(c45206713.spop)
 	c:RegisterEffect(e2)
 end
-c45206713.fusion_effect=true
 function c45206713.filter1(c,e)
 	return c:IsLocation(LOCATION_HAND) and not c:IsImmuneToEffect(e)
 end

c458748.lua

@@ -13,7 +13,6 @@ function c458748.initial_effect(c)
 	e1:SetOperation(c458748.activate)
 	c:RegisterEffect(e1)
 end
-c458748.fusion_effect=true
 function c458748.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e:SetLabel(100)
 	return true

c45906428.lua

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

c46136942.lua

@@ -33,7 +33,6 @@ function c46136942.initial_effect(c)
 	e3:SetOperation(c46136942.mfop)
 	c:RegisterEffect(e3)
 end
-c46136942.fusion_effect=true
 function c46136942.pffilter1(c,e)
 	return not c:IsImmuneToEffect(e)
 end

c47705572.lua

@@ -30,7 +30,6 @@ function c47705572.initial_effect(c)
 	e3:SetTarget(c47705572.ptg)
 	c:RegisterEffect(e3)
 end
-c47705572.fusion_effect=true
 function c47705572.splimit(e,c,sump,sumtype,sumpos,targetp)
 	return not (c:IsSetCard(0xdf) and c:IsType(TYPE_MONSTER)) and bit.band(sumtype,SUMMON_TYPE_PENDULUM)==SUMMON_TYPE_PENDULUM
 end

c48130397.lua

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

c48144509.lua

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

c50951254.lua

@@ -16,7 +16,7 @@ function c50951254.initial_effect(c)
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DRAW)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_DESTROYED)
-	e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP)
+	e2:SetProperty(EFFECT_FLAG_DELAY)
 	e2:SetRange(LOCATION_GRAVE)
 	e2:SetCountLimit(1,86346363)
 	e2:SetCondition(c50951254.spcon)

c51476410.lua

@@ -26,7 +26,6 @@ function c51476410.initial_effect(c)
 	e2:SetOperation(c51476410.atkop)
 	c:RegisterEffect(e2)
 end
-c51476410.fusion_effect=true
 function c51476410.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsReleasable() end
 	Duel.Release(e:GetHandler(),REASON_COST)

c51510279.lua

@@ -12,7 +12,6 @@ function c51510279.initial_effect(c)
 	e1:SetOperation(c51510279.activate)
 	c:RegisterEffect(e1)
 end
-c51510279.fusion_effect=true
 function c51510279.thfilter(c)
 	return (c:IsType(TYPE_NORMAL) or c:IsSetCard(0x165) and c:IsType(TYPE_MONSTER)) and c:IsAbleToHand()
 end

c51858200.lua

@@ -39,7 +39,6 @@ function c51858200.initial_effect(c)
 	e3:SetOperation(c51858200.spop)
 	c:RegisterEffect(e3)
 end
-c51858200.fusion_effect=true
 function c51858200.cfilter(c)
 	return c:IsLocation(LOCATION_MZONE) and c:GetCounter(0x1041)>0
 end

c52126602.lua

@@ -15,9 +15,8 @@ function s.initial_effect(c)
 	--spsummon
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(id,1))
-	e2:SetCategory(CATEGORY_TOHAND)
+	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_IGNITION)
-	e2:SetCode(EVENT_PHASE+PHASE_BATTLE)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1,id)
 	e2:SetTarget(s.sptg)

c52947044.lua

@@ -11,7 +11,6 @@ function c52947044.initial_effect(c)
 	e1:SetOperation(c52947044.activate)
 	c:RegisterEffect(e1)
 end
-c52947044.fusion_effect=true
 function c52947044.filter0(c)
 	return c:IsType(TYPE_MONSTER) and c:IsCanBeFusionMaterial() and c:IsAbleToGrave()
 end

c52963531.lua

@@ -24,7 +24,6 @@ function c52963531.initial_effect(c)
 	e3:SetOperation(c52963531.operation)
 	c:RegisterEffect(e3)
 end
-c52963531.fusion_effect=true
 function c52963531.cfilter(c,tp)
 	return c:IsFaceup() and c:IsType(TYPE_FUSION) and c:IsControler(tp)
 end

c54283059.lua

@@ -11,7 +11,6 @@ function c54283059.initial_effect(c)
 	e1:SetOperation(c54283059.activate)
 	c:RegisterEffect(e1)
 end
-c54283059.fusion_effect=true
 function c54283059.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetActivityCount(tp,ACTIVITY_SPSUMMON)==0 end
 	local e1=Effect.CreateEffect(e:GetHandler())

c54527349.lua

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

c55704856.lua

@@ -11,7 +11,6 @@ function c55704856.initial_effect(c)
 	e1:SetOperation(c55704856.activate)
 	c:RegisterEffect(e1)
 end
-c55704856.fusion_effect=true
 function c55704856.filter0(c)
 	return (c:IsLocation(LOCATION_MZONE) or c:IsFaceup()) and c:IsCanBeFusionMaterial() and c:IsAbleToDeck()
 end