21.13

.gitlab-ci.yml

@@ -91,7 +91,7 @@ add_script_diff:
     FIELDS: 'name,desc,overallString,picUrl'
     GIT_DEPTH: '1000'
     OUTPUT_FILENAME: test-release.json
-    REF_COMMIT: '21.11' # 更新的时候改这里，修改成上一个tag的版本号
+    REF_COMMIT: '21.12' # 更新的时候改这里，修改成上一个tag的版本号
   script:
     - apt update;apt -y install wget
     - currentPath=$PWD

pack/2026-01-24 BLZD.ydk

@@ -62,6 +62,7 @@
 101304065
 101304066
 101304067
+101304068
 101304069
 101304070
 101304208

script/c100256001.lua

 --王のしもべ－ブラック・マジシャン
+CATEGORY_SSET			   =0x200000000	--包含盖放魔陷的效果
 local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.EnableChangeCode(c,46986414,LOCATION_MZONE+LOCATION_GRAVE)

script/c101304009.lua

 --捕食植物ロンギネフィラ
+CATEGORY_SSET			   =0x200000000	--包含盖放魔陷的效果
 local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.AddCodeList(c,24094653)

script/c101304017.lua

 --ミミグル・フラワー
+CATEGORY_MSET			   =0x100000000	--包含盖放怪兽的效果
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--flip

script/c101304020.lua

 --糾罪巧-「Atilε.SPIA」
+CATEGORY_MSET			   =0x100000000	--包含盖放怪兽的效果
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--pendulum summon

script/c101304025.lua

 --妖光のディアーブロッケン
+CATEGORY_SSET			   =0x200000000	--包含盖放魔陷的效果
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--special summon

script/c101304029.lua

 --道化の一座 フレア
+CATEGORY_MSET			   =0x100000000	--包含盖放怪兽的效果
 local s,id,o=GetID()
 function s.initial_effect(c)
 	c:EnableReviveLimit()

script/c101304032.lua

 --道化の一座 ディアボロ
+CATEGORY_SSET			   =0x200000000	--包含盖放魔陷的效果
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--fusion material

script/c101304046.lua

 --道化の一座 デビルズ
+CATEGORY_SSET			   =0x200000000	--包含盖放魔陷的效果
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--xyz summon

script/c101304060.lua

 --道化の一座『開演』
+CATEGORY_SSET			   =0x200000000	--包含盖放魔陷的效果
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--activate
@@ -19,8 +20,7 @@ function s.initial_effect(c)
 	--draw
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(id,1))
-	-- TODO CATEGORY_SSET
-	e3:SetCategory(CATEGORY_DRAW)
+	e3:SetCategory(CATEGORY_DRAW+CATEGORY_SSET)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e3:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e3:SetCode(EVENT_PHASE+PHASE_END)

script/c101304062.lua

 --妖精伝姫のはじまりはじまり
+CATEGORY_SSET			   =0x200000000	--包含盖放魔陷的效果
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--Activate

script/c101304065.lua

 --糾罪巧－再巧
+CATEGORY_MSET			   =0x100000000	--包含盖放怪兽的效果
 local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.AddCodeList(c,17621695)

script/c101304066.lua

 --慿依共鳴
+CATEGORY_MSET			   =0x100000000	--包含盖放怪兽的效果
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--Activate

script/c101304067.lua

 --デーモンの簒奪
+CATEGORY_SSET			   =0x200000000	--包含盖放魔陷的效果
 local s,id,o=GetID()
 function s.initial_effect(c)
 	--Activate

script/c101304068.lua

@@ -57,17 +57,19 @@ end
 function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if e:GetLabel()==1 then
-		local e1=Effect.CreateEffect(c)
-		e1:SetType(EFFECT_TYPE_FIELD)
-		e1:SetCode(EFFECT_PIERCE)
-		e1:SetTargetRange(LOCATION_MZONE,0)
-		e1:SetTarget(s.atkfilter)
-		e1:SetReset(RESET_PHASE+PHASE_END)
-		Duel.RegisterEffect(e1,tp)
-		Duel.RegisterFlagEffect(tp,id,RESET_PHASE+PHASE_END,0,1)
+		if Duel.GetFlagEffect(tp,id)==0 then
+			local e1=Effect.CreateEffect(c)
+			e1:SetType(EFFECT_TYPE_FIELD)
+			e1:SetCode(EFFECT_PIERCE)
+			e1:SetTargetRange(LOCATION_MZONE,0)
+			e1:SetTarget(s.atkfilter)
+			e1:SetReset(RESET_PHASE+PHASE_END)
+			Duel.RegisterEffect(e1,tp)
+			Duel.RegisterFlagEffect(tp,id,RESET_PHASE+PHASE_END,0,1)
+		end
 	elseif e:GetLabel()==2 then
 		local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
-		local tg=g:Filter(Card.IsRelateToChain,nil)
+		local tg=g:Filter(Card.IsRelateToChain,nil):Filter(Card.IsOnField,nil)
 		if tg:GetCount()>0 then
 			Duel.Destroy(tg,REASON_EFFECT)
 		end
@@ -77,21 +79,24 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 		local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
 		local tc=g:GetFirst()
 		if tc then
-			if tc:IsAbleToHand() and (not tc:IsCanBeSpecialSummoned(e,0,tp,false,false) or ft<=0 or Duel.SelectOption(tp,1190,1152)==0) then
+			local spchk=ft>0 and tc:IsCanBeSpecialSummoned(e,0,tp,false,false)
+			if tc:IsAbleToHand() and (not spchk or Duel.SelectOption(tp,1190,1152)==0) then
 				Duel.SendtoHand(tc,nil,REASON_EFFECT)
 				Duel.ConfirmCards(1-tp,tc)
-			else
+			elseif spchk then
 				Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
 			end
 		end
 	elseif e:GetLabel()==4 then
-		local e2=Effect.CreateEffect(e:GetHandler())
-		e2:SetType(EFFECT_TYPE_FIELD)
-		e2:SetCode(EFFECT_DIRECT_ATTACK)
-		e2:SetTargetRange(LOCATION_MZONE,0)
-		e2:SetTarget(s.atkfilter)
-		e2:SetReset(RESET_PHASE+PHASE_END)
-		Duel.RegisterEffect(e2,tp)
-		Duel.RegisterFlagEffect(tp,id+o,RESET_PHASE+PHASE_END,0,1)
+		if Duel.GetFlagEffect(tp,id+o)==0 then
+			local e2=Effect.CreateEffect(e:GetHandler())
+			e2:SetType(EFFECT_TYPE_FIELD)
+			e2:SetCode(EFFECT_DIRECT_ATTACK)
+			e2:SetTargetRange(LOCATION_MZONE,0)
+			e2:SetTarget(s.atkfilter)
+			e2:SetReset(RESET_PHASE+PHASE_END)
+			Duel.RegisterEffect(e2,tp)
+			Duel.RegisterFlagEffect(tp,id+o,RESET_PHASE+PHASE_END,0,1)
+		end
 	end
-end
+end
\ No newline at end of file

script/c101304208.lua

 --覇者の鳴動
+CATEGORY_MSET			   =0x100000000	--包含盖放怪兽的效果
 local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.AddCodeList(c,70902743)