Update 真魔六武衆－キザン

.gitlab-ci.yml

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

script/c101207082.lua

@@ -60,4 +60,4 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp)
 			Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
 		end
 	end
-end
+end
\ No newline at end of file

script/c101207084.lua

@@ -81,4 +81,4 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
 	end
-end
+end
\ No newline at end of file

script/c101207085.lua

@@ -153,4 +153,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.HintSelection(g)
 		Duel.SendtoHand(g,nil,REASON_EFFECT)
 	end
-end
+end
\ No newline at end of file

script/c101207086.lua

@@ -80,4 +80,4 @@ end
 function s.setop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) then Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true) end
-end
+end
\ No newline at end of file

script/c101207087.lua

@@ -43,4 +43,4 @@ function s.tglimit(e,c)
 end
 function s.tgoval(e,re,rp)
 	return re:IsActiveType(TYPE_SPELL) and re:GetHandler():IsType(TYPE_EQUIP)
-end
+end
\ No newline at end of file

script/c101207088.lua

@@ -62,4 +62,4 @@ end
 function s.cacon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(Card.IsPosition,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,nil,POS_DEFENSE)
 		and not Duel.IsExistingMatchingCard(Card.IsPosition,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,nil,POS_ATTACK)
-end
+end
\ No newline at end of file

script/c101207089.lua

@@ -102,4 +102,4 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 end
 function s.atktg(e,c)
 	return c:IsAllTypes(TYPE_NORMAL+TYPE_MONSTER) and c:IsFaceup()
-end
+end
\ No newline at end of file

script/c101208042.lua

@@ -25,6 +25,7 @@ function s.initial_effect(c)
 	e3:SetCode(EVENT_FREE_CHAIN)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetProperty(EFFECT_FLAG_CARD_TARGET)
+	e3:SetHintTiming(0,TIMING_MAIN_END)
 	e3:SetCountLimit(1,id)
 	e3:SetCondition(s.descon)
 	e3:SetCost(s.descost)
@@ -44,12 +45,10 @@ function s.initial_effect(c)
 	c:RegisterEffect(e4)
 end
 function s.atkcon(e)
-	local ph=Duel.GetCurrentPhase()
-	return ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE
+	return Duel.IsBattlePhase()
 end
 function s.descon(e,tp,eg,ep,ev,re,r,rp)
-	local ph=Duel.GetCurrentPhase()
-	return (ph==PHASE_MAIN1 or ph==PHASE_MAIN2) and Duel.GetTurnPlayer()==1-tp
+	return Duel.IsMainPhase() and Duel.GetTurnPlayer()==1-tp
 end
 function s.cfilter(c)
 	return c:IsSetCard(0x203d) and c:IsAbleToRemoveAsCost()
@@ -87,4 +86,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 	if c:IsRelateToEffect(e) and aux.NecroValleyFilter()(c) then
 		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 	end
-end
+end
\ No newline at end of file