Merge branch 'master' into develop

6d7ecb8e · wind2009 · 44ca00ed · 66a91892 · 6d7ecb8e · 6d7ecb8e
Commit 6d7ecb8e authored Nov 23, 2024 by wind2009
47 changed files
--- a/c126218.lua
+++ b/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)

--- a/c12686296.lua
+++ b/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

--- a/c15521027.lua
+++ b/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)

--- a/c18843291.lua
+++ b/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()

--- a/c19652159.lua
+++ b/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)

--- a/c24643913.lua
+++ b/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()

--- a/c25131968.lua
+++ b/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)

--- a/c29913783.lua
+++ b/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)

--- a/c30439101.lua
+++ b/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)

--- a/c31863912.lua
+++ b/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)

--- a/c33114323.lua
+++ b/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)

--- a/c33206889.lua
+++ b/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)

--- a/c3376703.lua
+++ b/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

--- a/c34568403.lua
+++ b/c34568403.lua
@@ -21,7 +21,7 @@ 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)

--- a/c35798491.lua
+++ b/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)

--- a/c35975813.lua
+++ b/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)

--- a/c38299233.lua
+++ b/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)

--- a/c39761418.lua
+++ b/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

--- a/c40364916.lua
+++ b/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)

--- a/c40939228.lua
+++ b/c40939228.lua
@@ -110,7 +110,8 @@ 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
+	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)
@@ -122,6 +123,7 @@ function c40939228.negop(e,tp,eg,ep,ev,re,r,rp)
 			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

--- a/c45112597.lua
+++ b/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

--- a/c50951254.lua
+++ b/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)

--- a/c52126602.lua
+++ b/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)

--- a/c5641251.lua
+++ b/c5641251.lua
@@ -21,7 +21,7 @@ function c5641251.initial_effect(c)
 	--atk up
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(5641251,1))
-	e3:SetCategory(CATEGORY_DESTROY)
+	e3:SetCategory(CATEGORY_DICE+CATEGORY_DESTROY)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e3:SetCode(EVENT_BATTLE_CONFIRM)
 	e3:SetRange(LOCATION_SZONE)

--- a/c56655675.lua
+++ b/c56655675.lua
@@ -14,13 +14,25 @@ function c56655675.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
 	c:RegisterEffect(e1)
+	--gain effect
+	local e2=Effect.CreateEffect(c)
+	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
+	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
+	e2:SetCondition(c56655675.condition)
+	e2:SetOperation(c56655675.operation)
+	c:RegisterEffect(e2)
 	--negate
 	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e3:SetCode(EVENT_SPSUMMON_SUCCESS)
-	e3:SetCondition(c56655675.condition)
-	e3:SetOperation(c56655675.operation)
+	e3:SetCategory(CATEGORY_NEGATE+CATEGORY_DESTROY)
+	e3:SetType(EFFECT_TYPE_QUICK_O)
+	e3:SetCode(EVENT_CHAINING)
+	e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
+	e3:SetRange(LOCATION_MZONE)
+	e3:SetCondition(c56655675.discon)
+	e3:SetCost(c56655675.discost)
+	e3:SetTarget(c56655675.distg)
+	e3:SetOperation(c56655675.disop)
 	c:RegisterEffect(e3)
 end
 function c56655675.cfilter(c)
@@ -31,21 +43,11 @@ function c56655675.condition(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetSummonType()==SUMMON_TYPE_SPECIAL+SUMMON_VALUE_SELF
 end
 function c56655675.operation(e,tp,eg,ep,ev,re,r,rp)
-	local e1=Effect.CreateEffect(e:GetHandler())
-	e1:SetCategory(CATEGORY_NEGATE+CATEGORY_DESTROY)
-	e1:SetType(EFFECT_TYPE_QUICK_O)
-	e1:SetCode(EVENT_CHAINING)
-	e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
-	e1:SetRange(LOCATION_MZONE)
-	e1:SetCondition(c56655675.discon)
-	e1:SetCost(c56655675.discost)
-	e1:SetTarget(c56655675.distg)
-	e1:SetOperation(c56655675.disop)
-	e1:SetReset(RESET_EVENT+RESETS_WITHOUT_TEMP_REMOVE)
-	e:GetHandler():RegisterEffect(e1)
+	e:GetHandler():RegisterFlagEffect(56655675,RESET_EVENT+RESETS_WITHOUT_TEMP_REMOVE,0,1)
 end
 function c56655675.discon(e,tp,eg,ep,ev,re,r,rp)
-	return re~=e and not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED)
+	return e:GetHandler():GetFlagEffect(56655675)~=0
+		and re~=e and not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED)
 		and (re:IsActiveType(TYPE_MONSTER) or re:IsHasType(EFFECT_TYPE_ACTIVATE)) and Duel.IsChainNegatable(ev)
 end
 function c56655675.filter(c)

--- a/c61370518.lua
+++ b/c61370518.lua
@@ -13,6 +13,7 @@ function c61370518.initial_effect(c)
 	c:RegisterEffect(e1)
 	--disable and destroy
 	local e2=Effect.CreateEffect(c)
+	e2:SetCategory(CATEGORY_DICE)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_CHAIN_SOLVING)
 	e2:SetRange(LOCATION_MZONE)

--- a/c6812770.lua
+++ b/c6812770.lua
@@ -119,7 +119,6 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 			local dc=g:GetFirst()
 			local e1=Effect.CreateEffect(c)
 			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)

--- a/c72192100.lua
+++ b/c72192100.lua
@@ -13,6 +13,7 @@ function c72192100.initial_effect(c)
 	c:RegisterEffect(e1)
 	--disable and destroy
 	local e2=Effect.CreateEffect(c)
+	e2:SetCategory(CATEGORY_DICE)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_CHAIN_SOLVING)
 	e2:SetRange(LOCATION_MZONE)

--- a/c73219648.lua
+++ b/c73219648.lua
@@ -13,6 +13,7 @@ function c73219648.initial_effect(c)
 	c:RegisterEffect(e1)
 	--disable and destroy
 	local e2=Effect.CreateEffect(c)
+	e2:SetCategory(CATEGORY_DICE)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e2:SetCode(EVENT_CHAIN_SOLVING)
 	e2:SetRange(LOCATION_MZONE)

--- a/c74137509.lua
+++ b/c74137509.lua
@@ -3,7 +3,7 @@
 function c74137509.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)

--- a/c76895648.lua
+++ b/c76895648.lua
@@ -10,7 +10,7 @@ function c76895648.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(76895648,0))
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-	e2:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DRAW)
+	e2:SetCategory(CATEGORY_DICE+CATEGORY_ATKCHANGE+CATEGORY_DRAW)
 	e2:SetCode(EVENT_PHASE+PHASE_STANDBY)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetCountLimit(1)

--- a/c77672444.lua
+++ b/c77672444.lua
 --モーターバイオレンス
 ---@param c Card
 function c77672444.initial_effect(c)
+	aux.AddCodeList(c,82556059)
 	--atk up
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)

--- a/c77994337.lua
+++ b/c77994337.lua
@@ -6,6 +6,7 @@ function c77994337.initial_effect(c)
 	--level
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(77994337,0))
+	e1:SetCategory(CATEGORY_DICE)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetRange(LOCATION_PZONE)

--- a/c78394032.lua
+++ b/c78394032.lua
 --モーターシェル
 ---@param c Card
 function c78394032.initial_effect(c)
+	aux.AddCodeList(c,82556059)
 	--"Motor Token" Summon
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOKEN)

--- a/c7934362.lua
+++ b/c7934362.lua
@@ -89,7 +89,6 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp)
 	if tc:IsRelateToEffect(e) and tc:IsType(TYPE_MONSTER) and tc:IsFaceup() 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(-500)
 		e1:SetReset(RESET_EVENT+RESETS_STANDARD)

--- a/c82308875.lua
+++ b/c82308875.lua
@@ -7,7 +7,7 @@ function c82308875.initial_effect(c)
 	--destroy
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(82308875,0))
-	e1:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DRAW+CATEGORY_SPECIAL_SUMMON+CATEGORY_TOGRAVE)
+	e1:SetCategory(CATEGORY_DICE|CATEGORY_ATKCHANGE|CATEGORY_DRAW|CATEGORY_SPECIAL_SUMMON|CATEGORY_TOGRAVE)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCost(c82308875.cost)

--- a/c82556058.lua
+++ b/c82556058.lua
 --デモニック・モーター・Ω
 ---@param c Card
 function c82556058.initial_effect(c)
+	aux.AddCodeList(c,82556059)
 	--token
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(82556058,0))

--- a/c84397023.lua
+++ b/c84397023.lua
@@ -3,6 +3,7 @@
 function c84397023.initial_effect(c)
 	--activate
 	local e1=Effect.CreateEffect(c)
+	e1:SetCategory(CATEGORY_DICE)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetTarget(c84397023.tg)

--- a/c8581705.lua
+++ b/c8581705.lua
@@ -14,6 +14,7 @@ function c8581705.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(c8581705.disop)

--- a/c86767655.lua
+++ b/c86767655.lua
@@ -11,6 +11,7 @@ function c86767655.initial_effect(c)
 	c:RegisterEffect(e0)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e1:SetCategory(CATEGORY_DICE)
 	e1:SetCode(EVENT_CHAIN_SOLVING)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCountLimit(1,86767655)

--- a/c8963089.lua
+++ b/c8963089.lua
@@ -46,7 +46,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 end
 function s.thfilter(c)
-	return c.fusion_effect and c:IsAbleToHand()
+	return c:IsEffectProperty(aux.EffectCategoryFilter(CATEGORY_FUSION_SUMMON)) and c:IsAbleToHand()
 end
 function s.thop2(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_CARD,0,id)

--- a/c89812483.lua
+++ b/c89812483.lua
@@ -45,11 +45,12 @@ end
 function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
+	local ft,lv,race,att=e:GetLabel()
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local tc=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.filter2),tp,LOCATION_DECK+LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,e,tp,e:GetLabel()):GetFirst()
 	if tc and Duel.SpecialSummon(tc,0,tp,tp,true,true,POS_FACEUP)>0 then
 		tc:CompleteProcedure()
-		if c:IsOnField() and c:IsRelateToEffect(e) and Duel.SelectYesNo(tp,aux.Stringid(id,2)) then
+		if ft==1 and c:IsOnField() and c:IsRelateToEffect(e) and Duel.SelectYesNo(tp,aux.Stringid(id,2)) then
 			Duel.BreakEffect()
 			c:CancelToGrave(true)
 			if Duel.Equip(tp,c,tc)~=0 then

--- a/c93542102.lua
+++ b/c93542102.lua
@@ -4,7 +4,7 @@ function c93542102.initial_effect(c)
 	--special summon
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(93542102,0))
-	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DECKDES)
+	e1:SetCategory(CATEGORY_DICE+CATEGORY_SPECIAL_SUMMON+CATEGORY_DECKDES)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetCountLimit(1)
 	e1:SetRange(LOCATION_MZONE)
@@ -15,6 +15,7 @@ function c93542102.initial_effect(c)
 	--confirm
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(93542102,1))
+	e2:SetCategory(CATEGORY_DICE)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetCountLimit(1)
 	e2:SetRange(LOCATION_MZONE)

--- a/c96015976.lua
+++ b/c96015976.lua
@@ -9,6 +9,7 @@ function c96015976.initial_effect(c)
 	--
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(96015976,0))
+	e2:SetCategory(CATEGORY_DICE)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)

--- a/c9603356.lua
+++ b/c9603356.lua
@@ -14,6 +14,7 @@ function c9603356.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(c9603356.disop)

--- a/c98007437.lua
+++ b/c98007437.lua
@@ -72,7 +72,6 @@ function s.raatop(e,tp,eg,ep,ev,re,r,rp)
 			local tc=tg:GetFirst()
 			local e1=Effect.CreateEffect(c)
 			e1:SetType(EFFECT_TYPE_SINGLE)
-			e1:SetProperty(EFFECT_FLAG_COPY_INHERIT)
 			e1:SetCode(EFFECT_CHANGE_LEVEL)
 			e1:SetValue(tc:GetLevel())
 			e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE)

--- a/constant.lua
+++ b/constant.lua
@@ -304,20 +304,20 @@ EFFECT_TYPE_XMATERIAL		=0x1000		--作为超量素材时超量怪兽获得的效
 EFFECT_TYPE_GRANT			=0x2000		--使其他卡片获得效果（天气模样）
 EFFECT_TYPE_TARGET			=0x4000		--影响持续取的对象的效果（基本只用于魔陷）
 --========== Flags ==========	--效果的特殊性质
-EFFECT_FLAG_INITIAL			=0x0001		--在initial_effect建立的效果
-EFFECT_FLAG_FUNC_VALUE		=0x0002		--此效果的Value属性是函数
-EFFECT_FLAG_COUNT_LIMIT		=0x0004		--发动次数限制
-EFFECT_FLAG_FIELD_ONLY		=0x0008		--此效果是注册给全局环境的
+EFFECT_FLAG_INITIAL			=0x0001		--卡片记载的效果(internal)
+EFFECT_FLAG_FUNC_VALUE		=0x0002		--此效果的Value属性是函数(internal)
+EFFECT_FLAG_COUNT_LIMIT		=0x0004		--发动次数限制(internal)
+EFFECT_FLAG_FIELD_ONLY		=0x0008		--此效果是注册给玩家的(internal)
 EFFECT_FLAG_CARD_TARGET		=0x0010		--取对象效果
 EFFECT_FLAG_IGNORE_RANGE	=0x0020		--影响所有区域的卡（大宇宙）
-EFFECT_FLAG_ABSOLUTE_TARGET	=0x0040		--Target Range固定為某個玩家的視角所見的自己/對方(SetAbsoluteRange()專用)
+EFFECT_FLAG_ABSOLUTE_TARGET	=0x0040		--Target Range固定為某個玩家的視角所見的自己/對方(internal)
 EFFECT_FLAG_IGNORE_IMMUNE	=0x0080		--无视效果免疫
 EFFECT_FLAG_SET_AVAILABLE	=0x0100		--裡側狀態可發動的效果、影响场上里侧的卡的永續型效果
 EFFECT_FLAG_CAN_FORBIDDEN	=0x0200		--可被禁止令停止適用的效果（與EFFECT_FLAG_CANNOT_DISABLE並用）
 EFFECT_FLAG_CANNOT_DISABLE	=0x0400		--效果不会被无效
 EFFECT_FLAG_PLAYER_TARGET	=0x0800		--含有"以玩家为对象"的特性（精靈之鏡）、影響玩家的永續型效果(SetTargetRange()改成指定玩家)
 EFFECT_FLAG_BOTH_SIDE		=0x1000		--双方都能使用（部分场地，弹压）
-EFFECT_FLAG_COPY_INHERIT	=0x2000		--N/A
+EFFECT_FLAG_COPY			=0x2000		--复制得到的效果(internal)
 EFFECT_FLAG_DAMAGE_STEP		=0x4000		--可以在伤害步骤发动
 EFFECT_FLAG_DAMAGE_CAL		=0x8000		--可以在伤害计算时发动
 EFFECT_FLAG_DELAY			=0x10000	--場合型誘發效果、用於永續效果的EFFECT_TYPE_CONTINUOUS