Merge branch 'master' of https://code.mycard.moe/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: '5.14' # 更新的时候改这里，修改成上一个tag的版本号
+    REF_COMMIT: '5.15' # 更新的时候改这里，修改成上一个tag的版本号
   script:
     - apt update;apt -y install wget
     - currentPath=$PWD

script/c101206015.lua

@@ -57,7 +57,7 @@ function s.daop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,tp)
 	Duel.RegisterFlagEffect(tp,id,RESET_PHASE+PHASE_END,0,1)
 end
-function s.dafilter(c)
+function s.dafilter(e,c)
 	return c:IsSetCard(0x1a1) and c:IsLevelAbove(9)
 end
 function s.thcon(e,tp,eg,ep,ev,re,r,rp)
@@ -68,9 +68,9 @@ function s.thfilter(c)
 end
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) and chkc:IsControler(tp) and s.thfilter(chkc) and chkc~=e:GetHandler() end
-	if chk==0 then return Duel.IsExistingTarget(s.thfilter,tp,LOCATION_GRAVE,0,1,e:GetHandler()) end
+	if chk==0 then return Duel.IsExistingTarget(s.thfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,e:GetHandler()) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	local g=Duel.SelectTarget(tp,s.thfilter,tp,LOCATION_GRAVE,0,1,1,e:GetHandler())
+	local g=Duel.SelectTarget(tp,s.thfilter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,e:GetHandler())
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,0,0)
 end
 function s.thop(e,tp,eg,ep,ev,re,r,rp)
@@ -80,10 +80,9 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.cfilter(c,tp)
-	return c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_MZONE+LOCATION_HAND)
-		and c:IsPreviousPosition(POS_FACEUP) and c:IsPreviousSetCard(0x1a1)
-		and c:IsReason(REASON_BATTLE+REASON_EFFECT)
-		and c:IsType(TYPE_MONSTER)
+	return c:IsPreviousControler(tp) and c:IsType(TYPE_MONSTER) and c:IsReason(REASON_BATTLE+REASON_EFFECT)
+		and (c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousPosition(POS_FACEUP) and c:IsPreviousSetCard(0x1a1)
+			or c:IsPreviousLocation(LOCATION_HAND) and c:IsSetCard(0x1a1))
 end
 function s.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(s.cfilter,1,nil,tp) and not eg:IsContains(e:GetHandler())

script/c101206070.lua

+--傀儡流儀－パペット・シャーク
+local s,id,o=GetID()
+function s.initial_effect(c)
+	--to hand
+	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(id,0))
+	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	e1:SetType(EFFECT_TYPE_ACTIVATE)
+	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetCountLimit(1,id+EFFECT_COUNT_CODE_OATH)
+	e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_MAIN_END)
+	e1:SetTarget(s.thtg)
+	e1:SetOperation(s.thop)
+	c:RegisterEffect(e1)
+end
+function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.CheckRemoveOverlayCard(tp,1,1,1,REASON_EFFECT) and Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>=4 and (Duel.GetDecktopGroup(tp,4):IsExists(Card.IsAbleToHand,1,nil) or Duel.GetLocationCount(tp,LOCATION_SZONE)>0) end
+end
+function s.thfilter(c,tp)
+	return c:IsType(TYPE_TRAP) and Duel.GetLocationCount(tp,LOCATION_SZONE)>0 or c:IsAbleToHand() 
+end
+function s.thop(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	if Duel.RemoveOverlayCard(tp,1,1,1,1,REASON_EFFECT)~=0 then
+		Duel.ConfirmDecktop(tp,4)
+		local g=Duel.GetDecktopGroup(tp,4):Filter(s.thfilter,nil,tp)
+		if #g>0 then
+			Duel.DisableShuffleCheck()
+			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
+			local sc=g:Select(tp,1,1,nil):GetFirst()
+			if sc:IsType(TYPE_TRAP) then
+				if Duel.SSet(tp,sc)>0 then
+					local e1=Effect.CreateEffect(c)
+					e1:SetDescription(aux.Stringid(id,1))
+					e1:SetType(EFFECT_TYPE_SINGLE)
+					e1:SetCode(EFFECT_TRAP_ACT_IN_SET_TURN)
+					e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
+					e1:SetReset(RESET_EVENT+RESETS_STANDARD)
+					sc:RegisterEffect(e1)
+				end
+			else
+				Duel.SendtoHand(sc,nil,REASON_EFFECT)
+				Duel.ConfirmCards(1-tp,sc)
+				Duel.ShuffleHand(tp)
+			end
+		end
+	end
+end
\ No newline at end of file