Merge branch 'master' of https://code.moenext.com/mycard/pre-release-database-cdb

.gitlab-ci.yml

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

script/c100227072.lua

@@ -16,7 +16,6 @@ function s.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE)
 	e2:SetCode(EFFECT_RITUAL_LEVEL)
 	e2:SetValue(s.rlevel)
-	e2:SetRange(LOCATION_MZONE)
 	c:RegisterEffect(e2)
 	--tohand
 	local e3=Effect.CreateEffect(c)
@@ -49,7 +48,9 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.rlevel(e,c)
-	local lv=aux.GetCappedLevel(e:GetHandler())
+	local ec=e:GetHandler()
+	local lv=aux.GetCappedLevel(ec)
+	if not ec:IsLocation(LOCATION_MZONE) then return lv end
 	if c:IsSetCard(0xb4) then
 		local clv=c:GetLevel()
 		return (lv<<16)+clv
@@ -69,7 +70,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetMatchingGroup(s.thfilter,tp,LOCATION_REMOVED,0,nil)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local tg=g:SelectSubGroup(tp,aux.dncheck,false,1,g:GetCount())
-	if tg:GetCount()>0 then
+	if tg and tg:GetCount()>0 then
 		Duel.SendtoHand(tg,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,tg)
 	end

script/c100227073.lua

@@ -32,7 +32,6 @@ function s.initial_effect(c)
 	e4:SetType(EFFECT_TYPE_SINGLE)
 	e4:SetCode(EFFECT_RITUAL_LEVEL)
 	e4:SetValue(s.rlevel)
-	e4:SetRange(LOCATION_MZONE)
 	c:RegisterEffect(e4)
 end
 function s.cfilter(c)
@@ -69,7 +68,9 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.rlevel(e,c)
-	local lv=aux.GetCappedLevel(e:GetHandler())
+	local ec=e:GetHandler()
+	local lv=aux.GetCappedLevel(ec)
+	if not ec:IsLocation(LOCATION_MZONE) then return lv end
 	if c:IsSetCard(0xb4) then
 		local clv=c:GetLevel()
 		return (lv<<16)+clv

script/c100227074.lua

@@ -2,6 +2,7 @@
 local s,id,o=GetID()
 ---@param c Card
 function s.initial_effect(c)
+	c:EnableReviveLimit()
 	aux.EnablePendulumAttribute(c)
 	--Cannot Special Summon
 	local e0=Effect.CreateEffect(c)
@@ -51,8 +52,7 @@ function s.mat_filter(c)
 	return not c:IsLevel(9)
 end
 function s.cfilter(c,tp)
-	return c:IsPreviousPosition(POS_FACEUP) and c:IsPreviousControler(tp)
-		and c:IsControler(tp) and c:IsSetCard(0xb4)
+	return c:IsFaceupEx() and c:IsPreviousControler(tp) and c:IsControler(tp) and c:IsSetCard(0xb4)
 end
 function s.rmcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(s.cfilter,1,nil,tp) and e:GetHandler():IsStatus(STATUS_EFFECT_ENABLED)

script/c100227075.lua

@@ -29,7 +29,7 @@ function s.condition(e,tp,eg,ep,ev,re,r,rp)
 	local ph=Duel.GetCurrentPhase()
 	return ph==PHASE_MAIN1 or ph==PHASE_MAIN2
 end
-function s.rfilter(c,e,tp)
+function s.rfilter(c)
 	return c:IsFaceupEx() and c:IsSetCard(0xb4)
 end
 function s.mfilter(c)