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

.gitignore

+/test-release.cdb

.gitlab-ci.yml

@@ -35,7 +35,7 @@ merge_databases:
     - linux
   script:
     - apt update && apt -y install sqlite3
-    - ls cdbs/test-release.cdb | xargs -I '{}' sqlite3 '{}' .dump | sqlite3 test-release.cdb
+    - ls -1 *.cdb | sed '/test-update.cdb/d' | xargs -I '{}' sqlite3 '{}' .dump | sqlite3 test-release.cdb
   artifacts:
     paths:
       - test-release.cdb
@@ -72,7 +72,8 @@ pack:
     - linux
   script:
     - mkdir -p data archive
-    - mv *.cdb data/
+    - mv test-release.cdb data/
+    - mv test-update.cdb data/
     - mv pics data/
     - mv script data/
     - mv *.conf data/
@@ -98,7 +99,8 @@ server:
     - linux
   script:
     - mkdir server-dist
-    - mv *.cdb server-dist
+    - mv test-release.cdb server-dist
+    - mv test-update.cdb server-dist
     - mv *.conf server-dist
     - mv script server-dist
     # merge ygopro-pre-data

script/c101204010.lua

---幻奏的歌姬 库普乐
+
+--幻奏の歌姫クープレ
 function c101204010.initial_effect(c)
 	aux.EnablePendulumAttribute(c)
 	local e0=Effect.CreateEffect(c)

script/c101204035.lua

@@ -19,6 +19,7 @@ function s.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetCode(EFFECT_CANNOT_DISEFFECT)
 	e2:SetRange(LOCATION_MZONE)
+	e2:SetCondition(s.inacon)
 	e2:SetValue(s.effectfilter)
 	c:RegisterEffect(e2)
 	--spsummon_grave
@@ -46,6 +47,9 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_DECK,0,1,1,nil,e,tp)
 	if g:GetCount()>0 then Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP) end
 end
+function s.inacon(e)
+	return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION)
+end
 function s.effectfilter(e,ct)
 	local te=Duel.GetChainInfo(ct,CHAININFO_TRIGGERING_EFFECT)
 	return te:IsActiveType(TYPE_FUSION) and te:GetHandler():IsSetCard(0x9b)

script/c101204036.lua

@@ -41,6 +41,7 @@ function s.rmop(e,tp,eg,ep,ev,re,r,rp)
 	if #sg==0 or Duel.Remove(sg,0,REASON_EFFECT+REASON_TEMPORARY)==0
 		or not sg:IsExists(Card.IsLocation,1,nil,LOCATION_REMOVED) then return end
 	local og=Duel.GetOperatedGroup():Filter(Card.IsLocation,nil,LOCATION_REMOVED)
+	og=og-og:Filter(Card.IsReason,nil,REASON_REDIRECT)
 	for tc in aux.Next(og) do
 		tc:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
 	end