Merge remote-tracking branch 'upstream/master' into master

12ef99bd · wind2009 · 11e3ff77 · c105173b · 12ef99bd · 12ef99bd
Commit 12ef99bd authored Sep 26, 2024 by wind2009
18 changed files
--- a/c30241314.lua
+++ b/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

--- a/c31849106.lua
+++ b/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:SetTarget(aux.DimensionalFissureTarget)
-	e1:SetTargetRange(0xff,0xff)
+	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
--- a/c45675980.lua
+++ b/c45675980.lua
@@ -23,7 +23,6 @@ function c45675980.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(0xfe,0xfe)
 	e2:SetValue(LOCATION_REMOVED)
 	e2:SetCondition(c45675980.rmcon)
 	e2:SetTarget(c45675980.rmtg)

--- a/c46502744.lua
+++ b/c46502744.lua
@@ -17,7 +17,7 @@ function c46502744.initial_effect(c)
 	e2:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCode(EFFECT_TO_GRAVE_REDIRECT)
-	e2:SetTargetRange(0xff,0xff)
+	e2:SetTargetRange(LOCATION_DECK,LOCATION_DECK)
 	e2:SetCondition(c46502744.remcon)
 	e2:SetValue(LOCATION_REMOVED)
 	c:RegisterEffect(e2)

--- a/c48626373.lua
+++ b/c48626373.lua
@@ -10,7 +10,7 @@ function s.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCode(EFFECT_TO_GRAVE_REDIRECT)
-	e1:SetTargetRange(0xff,0xff)
+	e1:SetTargetRange(LOCATION_DECK,LOCATION_DECK)
 	e1:SetValue(LOCATION_REMOVED)
 	c:RegisterEffect(e1)
 	--material

--- a/c53701259.lua
+++ b/c53701259.lua
@@ -58,7 +58,7 @@ function c53701259.initial_effect(c)
 	e7:SetCode(EFFECT_TO_GRAVE_REDIRECT)
 	e7:SetRange(LOCATION_SZONE)
 	e7:SetValue(LOCATION_REMOVED)
-	e7:SetTargetRange(0xfe,0xff)
+	e7:SetTargetRange(0,LOCATION_DECK)
 	e7:SetTarget(c53701259.rmtg)
 	e7:SetCondition(c53701259.rmcon)
 	c:RegisterEffect(e7)
@@ -136,8 +136,7 @@ function c53701259.disop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.NegateEffect(ev)
 end
 function c53701259.rmtg(e,c)
-	return c:GetOwner()~=e:GetHandlerPlayer() and not c:IsLocation(LOCATION_OVERLAY)
+	return c:GetOwner()~=e:GetHandlerPlayer() and aux.DimensionalFissureTarget(e,c)
-		and not c:IsType(TYPE_SPELL+TYPE_TRAP)
 end
 function c53701259.rmcon(e)
 	local tp=e:GetHandlerPlayer()

--- a/c58481572.lua
+++ b/c58481572.lua
@@ -14,7 +14,7 @@ function c58481572.initial_effect(c)
 	e2:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE)
 	e2:SetCode(EFFECT_TO_GRAVE_REDIRECT)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetTargetRange(0xfe,0xff)
+	e2:SetTargetRange(0,LOCATION_DECK)
 	e2:SetValue(LOCATION_REMOVED)
 	e2:SetTarget(c58481572.rmtg)
 	c:RegisterEffect(e2)

--- a/c58844135.lua
+++ b/c58844135.lua
@@ -7,7 +7,7 @@ function c58844135.initial_effect(c)
 	e1:SetCode(EFFECT_TO_GRAVE_REDIRECT)
 	e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE)
 	e1:SetRange(LOCATION_PZONE)
-	e1:SetTargetRange(0xff,0xff)
+	e1:SetTargetRange(LOCATION_DECK,LOCATION_DECK)
 	e1:SetTarget(c58844135.rmtarget)
 	e1:SetValue(LOCATION_REMOVED)
 	c:RegisterEffect(e1)

--- a/c61528025.lua
+++ b/c61528025.lua
@@ -6,7 +6,7 @@ function c61528025.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE)
 	e1:SetCode(EFFECT_TO_GRAVE_REDIRECT)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetTargetRange(0xff,0xff)
+	e1:SetTargetRange(LOCATION_DECK,LOCATION_DECK)
 	e1:SetValue(LOCATION_REMOVED)
 	c:RegisterEffect(e1)
 end
--- a/c69072185.lua
+++ b/c69072185.lua
@@ -29,7 +29,7 @@ function c69072185.initial_effect(c)
 	e3:SetRange(LOCATION_PZONE)
 	e3:SetCondition(c69072185.rmcon)
 	e3:SetTarget(c69072185.rmtarget)
-	e3:SetTargetRange(0xff,0xff)
+	e3:SetTargetRange(LOCATION_DECK,LOCATION_DECK)
 	e3:SetValue(LOCATION_REMOVED)
 	c:RegisterEffect(e3)
 end

--- a/c79606837.lua
+++ b/c79606837.lua
@@ -6,8 +6,8 @@ function c79606837.initial_effect(c)
 	--remove
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
 	e1:SetCode(EFFECT_TO_GRAVE_REDIRECT)
+	e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_IMMUNE)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetTarget(c79606837.rmtarget)
 	e1:SetTargetRange(LOCATION_HAND+LOCATION_DECK,LOCATION_HAND+LOCATION_DECK)

--- a/c81674782.lua
+++ b/c81674782.lua
@@ -11,8 +11,8 @@ function c81674782.initial_effect(c)
 	e2:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE)
 	e2:SetCode(EFFECT_TO_GRAVE_REDIRECT)
 	e2:SetRange(LOCATION_SZONE)
-	e2:SetTarget(c81674782.rmtarget)
+	e2:SetTarget(aux.DimensionalFissureTarget)
-	e2:SetTargetRange(0xff,0xff)
+	e2:SetTargetRange(LOCATION_DECK,LOCATION_DECK)
 	e2:SetValue(LOCATION_REMOVED)
 	c:RegisterEffect(e2)
 	--
@@ -25,9 +25,6 @@ function c81674782.initial_effect(c)
 	e3:SetTarget(c81674782.checktg)
 	c:RegisterEffect(e3)
 end
-function c81674782.rmtarget(e,c)
-	return c:GetOriginalType()&TYPE_MONSTER>0 and not c:IsLocation(0x80) and not c:IsType(TYPE_SPELL+TYPE_TRAP)
-end
 function c81674782.checktg(e,c)
 	return not c:IsPublic()
 end
--- a/c83705073.lua
+++ b/c83705073.lua
@@ -15,7 +15,6 @@ function c83705073.initial_effect(c)
 	e2:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE)
 	e2:SetCode(EFFECT_TO_GRAVE_REDIRECT)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetTargetRange(0xfe,0xfe)
 	e2:SetValue(LOCATION_REMOVED)
 	e2:SetTarget(c83705073.rmtg)
 	c:RegisterEffect(e2)

--- a/c91800273.lua
+++ b/c91800273.lua
@@ -23,7 +23,7 @@ function c91800273.redop(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:SetTargetRange(0xff,0xff)
+	e1:SetTargetRange(LOCATION_DECK,LOCATION_DECK)
 	e1:SetValue(LOCATION_REMOVED)
 	e1:SetReset(RESET_PHASE+PHASE_END,2)
 	Duel.RegisterEffect(e1,tp)

--- a/c93449450.lua
+++ b/c93449450.lua
@@ -35,7 +35,7 @@ function c93449450.initial_effect(c)
 	e4:SetRange(LOCATION_MZONE)
 	e4:SetCondition(c93449450.excon)
 	e4:SetTarget(c93449450.extg)
-	e4:SetTargetRange(0xfe,0xff)
+	e4:SetTargetRange(0,LOCATION_DECK)
 	e4:SetValue(LOCATION_REMOVED)
 	c:RegisterEffect(e4)
 end

--- a/c94853057.lua
+++ b/c94853057.lua
@@ -6,7 +6,7 @@ function c94853057.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE)
 	e1:SetCode(EFFECT_TO_GRAVE_REDIRECT)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetTargetRange(0xff,0xff)
+	e1:SetTargetRange(LOCATION_DECK,LOCATION_DECK)
 	e1:SetValue(LOCATION_REMOVED)
 	c:RegisterEffect(e1)
 end
--- a/constant.lua
+++ b/constant.lua
@@ -304,7 +304,7 @@ EFFECT_TYPE_XMATERIAL		=0x1000		--作为超量素材时超量怪兽获得的效
 EFFECT_TYPE_GRANT			=0x2000		--使其他卡片获得效果（天气模样）
 EFFECT_TYPE_TARGET			=0x4000		--影响持续取的对象的效果（基本只用于魔陷）
 --========== Flags ==========	--效果的特殊性质
-EFFECT_FLAG_INITIAL			=0x0001		--可以发动的
+EFFECT_FLAG_INITIAL			=0x0001		--在initial_effect建立的效果
 EFFECT_FLAG_FUNC_VALUE		=0x0002		--此效果的Value属性是函数
 EFFECT_FLAG_COUNT_LIMIT		=0x0004		--发动次数限制
 EFFECT_FLAG_FIELD_ONLY		=0x0008		--此效果是注册给全局环境的
@@ -869,6 +869,10 @@ DUEL_TAG_MODE			=0x20		--双打PP
 DUEL_SIMPLE_AI			=0x40		--AI(用于残局)
 DUEL_RETURN_DECK_TOP	=0x80		--回卡组洗切的卡放到卡组最上方（不洗牌模式下曾经的默认行为）
 DUEL_REVEAL_DECK_SEQ	=0x100		--从卡组选卡显示实际顺序（曾经的默认行为）
+--Duel rule (Debug.ReloadFieldBegin)
+MASTER_RULE3		=3	--Master Rule 3 (2014)
+NEW_MASTER_RULE		=4	--New Master Rule (2017)
+MASTER_RULE_2020	=5	--Master Rule 2020
 --Activity counter
 --global: 1-6 (binary: 5,6)
 --custom: 1-5,7 (binary: 1-5)

--- a/utility.lua
+++ b/utility.lua
@@ -1768,3 +1768,7 @@ function Auxiliary.IsCanBeQuickEffect(c,tp,code)
 	local filter=Auxiliary.quick_effect_filter[code]
 	return Duel.IsPlayerAffectedByEffect(tp,code)~=nil and filter~=nil and filter(c)
 end
+--
+function Auxiliary.DimensionalFissureTarget(e,c)
+	return c:GetOriginalType()&TYPE_MONSTER>0 and not c:IsLocation(LOCATION_OVERLAY) and not c:IsType(TYPE_SPELL+TYPE_TRAP)
+end