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

script/c101305004.lua

@@ -77,7 +77,8 @@ function s.effop(e,tp,eg,ep,ev,re,r,rp)
 			e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
 			if tc:IsType(TYPE_QUICKPLAY) then
 				e1:SetCode(EFFECT_QP_ACT_IN_SET_TURN)
-			elseif tc:IsType(TYPE_TRAP) then
+			end
+			if tc:IsType(TYPE_TRAP) then
 				e1:SetCode(EFFECT_TRAP_ACT_IN_SET_TURN)
 			end
 			e1:SetReset(RESET_EVENT+RESETS_STANDARD)

script/c101305027.lua

 --黒き混沌の魔術師ブラック・カオス
 local s,id,o=GetID()
 function s.initial_effect(c)
+	aux.AddCodeList(c,101305044)
 	c:EnableReviveLimit()
 	--to hand
 	local e1=Effect.CreateEffect(c)

script/c101305065.lua

@@ -65,6 +65,7 @@ function s.cfilter(c,e,tp)
 		and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp,c:GetCode())
 end
 function s.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil,e,tp) end
 	if chk==0 then return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil,e,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
 	local g=Duel.SelectMatchingCard(tp,s.cfilter,tp,LOCATION_MZONE,0,1,1,nil,e,tp)