18.7

.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: '18.5' # 更新的时候改这里，修改成上一个tag的版本号
+    REF_COMMIT: '18.6' # 更新的时候改这里，修改成上一个tag的版本号
   script:
     - apt update;apt -y install wget
     - currentPath=$PWD

script/c101303054.lua

---決闘進化-バスター・ゾーン
+--決闘進化－バスター・ゾーン
 local s,id,o=GetID()
 function s.initial_effect(c)
 	aux.AddCodeList(c,80280737)
@@ -53,7 +53,7 @@ function s.indtg(e,c)
 	return c:IsSetCard(0x104f) and c:IsStatus(STATUS_SPSUMMON_TURN)
 end
 function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.CheckLPCost(tp,2000) end
+	if chk==0 then return Duel.CheckLPCost(tp,2000) and Duel.GetFlagEffect(tp,101303054)==0 end
 	Duel.PayLPCost(tp,2000)
 end
 function s.operation(e,tp,eg,ep,ev,re,r,rp)

script/c80280737.lua

@@ -6,43 +6,30 @@ function c80280737.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetHintTiming(0,TIMING_END_PHASE)
-	e1:SetCost(c80280737.cost)
 	e1:SetTarget(c80280737.target)
 	e1:SetOperation(c80280737.activate)
 	c:RegisterEffect(e1)
 end
-function c80280737.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	e:SetLabel(1)
-	return true
-end
 function c80280737.filter1(c,e,tp)
-	return c:IsType(TYPE_SYNCHRO) and Duel.GetMZoneCount(tp,c)>0
-		and Duel.IsExistingMatchingCard(c80280737.filter2,tp,LOCATION_DECK,0,1,nil,e,tp,c:GetCode())
-end
-function c80280737.cfilter(c,e,tp)
-	return c:IsType(TYPE_SYNCHRO) and c:IsReleasable()
+	return c:IsType(TYPE_SYNCHRO) and c:IsReleasable() and Duel.GetMZoneCount(tp,c)>0
 		and Duel.IsExistingMatchingCard(c80280737.filter2,tp,LOCATION_DECK,0,1,nil,e,tp,c:GetCode())
 end
 function c80280737.filter2(c,e,tp,tcode)
 	return c:IsSetCard(0x104f) and c.assault_name==tcode and c:IsCanBeSpecialSummoned(e,0,tp,false,true,POS_FACEUP_ATTACK)
 end
 function c80280737.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	local b1=Duel.CheckReleaseGroup(tp,c80280737.filter1,1,nil,e,tp)
-	local b2=Duel.GetFlagEffect(tp,101303054)>Duel.GetFlagEffect(tp,80280737)
-		and Duel.IsExistingMatchingCard(c80280737.cfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp)
-	if chk==0 then
-		if e:GetLabel()~=1 then return false end
-		e:SetLabel(0)
-		return b1 or b2
+	local g=Duel.GetReleaseGroup(tp,false):Filter(c80280737.filter1,nil,e,tp)
+	if Duel.GetFlagEffect(tp,101303054)>Duel.GetFlagEffect(tp,80280737) then
+		g:Merge(Duel.GetMatchingGroup(c80280737.filter1,tp,LOCATION_EXTRA,0,nil,e,tp))
 	end
-	local rg=Group.CreateGroup()
-	if b1 and (not b2 or not Duel.SelectYesNo(tp,aux.Stringid(80280737,1))) then
-		rg=Duel.SelectReleaseGroup(tp,c80280737.filter1,1,1,nil,e,tp)
-	else
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RELEASE)
-		rg=Duel.SelectMatchingCard(tp,c80280737.cfilter,tp,LOCATION_EXTRA,0,1,1,nil,e,tp)
+	if chk==0 then return e:IsCostChecked() and g:GetCount()>0 end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RELEASE)
+	local rg=g:Select(tp,1,1,nil)
+	if rg:IsExists(Card.IsLocation,1,nil,LOCATION_EXTRA) then
+		Duel.Hint(HINT_CARD,0,101303054)
 		Duel.RegisterFlagEffect(tp,80280737,RESET_PHASE+PHASE_END,0,1)
 	end
+	aux.UseExtraReleaseCount(rg,tp)
 	e:SetLabel(rg:GetFirst():GetCode())
 	Duel.Release(rg,REASON_COST)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)