update (#1176)

c10691144.lua

@@ -2,8 +2,8 @@
 function c10691144.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
+	e1:SetCategory(CATEGORY_GRAVE_ACTION)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
-	e1:SetProperty(EFFECT_FLAG_OPTIONAL_GY_ACTION)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetOperation(c10691144.activate)
 	c:RegisterEffect(e1)

c22747316.lua

@@ -2,9 +2,8 @@
 function c22747316.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_NEGATE+CATEGORY_DESTROY+CATEGORY_TOHAND)
+	e1:SetCategory(CATEGORY_NEGATE+CATEGORY_DESTROY+CATEGORY_TOHAND+CATEGORY_GRAVE_ACTION)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
-	e1:SetProperty(EFFECT_FLAG_OPTIONAL_GY_ACTION)
 	e1:SetCode(EVENT_CHAINING)
 	e1:SetCondition(c22747316.condition)
 	e1:SetTarget(c22747316.target)

c39185163.lua

@@ -3,9 +3,8 @@ function c39185163.initial_effect(c)
 	--negate / banish
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(39185163,0))
-	e1:SetCategory(CATEGORY_DISABLE+CATEGORY_REMOVE)
+	e1:SetCategory(CATEGORY_DISABLE+CATEGORY_REMOVE+CATEGORY_GRAVE_ACTION)
 	e1:SetType(EFFECT_TYPE_QUICK_O)
-	e1:SetProperty(EFFECT_FLAG_OPTIONAL_GY_ACTION)
 	e1:SetCode(EVENT_CHAINING)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCondition(c39185163.disrmcon)

c41139112.lua

@@ -2,9 +2,8 @@
 function c41139112.initial_effect(c)
 	--activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_DICE+CATEGORY_SPECIAL_SUMMON)
+	e1:SetCategory(CATEGORY_DICE+CATEGORY_SPECIAL_SUMMON+CATEGORY_GRAVE_ACTION)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
-	e1:SetProperty(EFFECT_FLAG_OPTIONAL_GY_ACTION)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetCountLimit(1,41139112+EFFECT_COUNT_CODE_OATH)
 	e1:SetCost(c41139112.cost)

c73642296.lua

@@ -24,12 +24,13 @@ function c73642296.discon(e,tp,eg,ep,ev,re,r,rp)
 	local ex3,g3,gc3,dp3,dv3=Duel.GetOperationInfo(ev,CATEGORY_TOEXTRA)
 	local ex4,g4,gc4,dp4,dv4=Duel.GetOperationInfo(ev,CATEGORY_SPECIAL_SUMMON)
 	local ex5,g5,gc5,dp5,dv5=Duel.GetOperationInfo(ev,CATEGORY_REMOVE)
+	local ex6=Duel.GetOperationInfo(ev,CATEGORY_GRAVE_ACTION)
 	return ((ex1 and (bit.band(dv1,LOCATION_GRAVE)==LOCATION_GRAVE or g1 and g1:IsExists(Card.IsLocation,1,nil,LOCATION_GRAVE)))
 		or (ex2 and (bit.band(dv2,LOCATION_GRAVE)==LOCATION_GRAVE or g2 and g2:IsExists(Card.IsLocation,1,nil,LOCATION_GRAVE)))
 		or (ex3 and (bit.band(dv3,LOCATION_GRAVE)==LOCATION_GRAVE or g3 and g3:IsExists(Card.IsLocation,1,nil,LOCATION_GRAVE)))
 		or (ex4 and (bit.band(dv4,LOCATION_GRAVE)==LOCATION_GRAVE or g4 and g4:IsExists(c73642296.cfilter,1,nil)))
 		or (ex5 and (bit.band(dv5,LOCATION_GRAVE)==LOCATION_GRAVE or g5 and g5:IsExists(Card.IsLocation,1,nil,LOCATION_GRAVE)))
-		or re:IsHasProperty(EFFECT_FLAG_OPTIONAL_GY_ACTION))
+		or ex6)
 		and Duel.IsChainNegatable(ev)
 end
 function c73642296.discost(e,tp,eg,ep,ev,re,r,rp,chk)

c87288189.lua

@@ -16,9 +16,9 @@ function c87288189.initial_effect(c)
 	--destroy
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(87288189,1))
-	e3:SetCategory(CATEGORY_REMOVE+CATEGORY_DAMAGE)
+	e3:SetCategory(CATEGORY_REMOVE+CATEGORY_DAMAGE+CATEGORY_GRAVE_ACTION)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e3:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_OPTIONAL_GY_ACTION)
+	e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e3:SetCode(EVENT_SUMMON_SUCCESS)
 	e3:SetCondition(c87288189.condition)
 	e3:SetTarget(c87288189.target)

c96729612.lua

@@ -2,9 +2,8 @@
 function c96729612.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_GRAVE_ACTION)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
-	e1:SetProperty(EFFECT_FLAG_OPTIONAL_GY_ACTION)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetTarget(c96729612.target)
 	e1:SetOperation(c96729612.activate)

constant.lua

@@ -290,7 +290,7 @@ EFFECT_FLAG_EVENT_PLAYER	=0x800000	--视为对方玩家的效果（动作？）
 EFFECT_FLAG_OWNER_RELATE	=0x1000000	--持續成為對象
 EFFECT_FLAG_CANNOT_INACTIVATE	=0x2000000	--發動不會被無效
 EFFECT_FLAG_CLIENT_HINT		=0x4000000	--客户端提示
-EFFECT_FLAG_OPTIONAL_GY_ACTION	=0x8000000	--發動時不確定的部分含有可被屋敷童無效的行動(屋敷童)
+EFFECT_FLAG_OPTIONAL_GY_ACTION	=0x8000000	--N/A
 EFFECT_FLAG_LIMIT_ZONE		=0x10000000 --限制魔法·陷阱卡发动时可以放置的区域
 EFFECT_FLAG_COF				=0x20000000 --N/A
 EFFECT_FLAG_CVAL_CHECK		=0x40000000	--N/A
@@ -649,7 +649,8 @@ CATEGORY_LVCHANGE			=0x8000000	--改变等级效果
 CATEGORY_NEGATE				=0x10000000	--使发动无效效果
 CATEGORY_ANNOUNCE			=0x20000000	--發動時宣言卡名的效果
 CATEGORY_FUSION_SUMMON		=0x40000000	--融合召唤效果（暴走魔法阵）
-CATEGORY_TOEXTRA			=0x80000000	--
+CATEGORY_TOEXTRA			=0x80000000	--回额外卡组效果
+CATEGORY_GRAVE_ACTION		=0x100000000	--包含涉及墓地的部分的效果（屋敷わらし）
 --Hint
 HINT_EVENT				=1
 HINT_MESSAGE			=2