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

script/c100220002.lua

@@ -25,7 +25,7 @@ function s.initial_effect(c)
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(id,2))
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e3:SetCode(EVENT_SPSUMMON_SUCCESS)
+	e3:SetCode(EVENT_CUSTOM+id)
 	e3:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
 	e3:SetRange(LOCATION_GRAVE+LOCATION_HAND)
 	e3:SetCountLimit(1,id+o*2)
@@ -33,6 +33,7 @@ function s.initial_effect(c)
 	e3:SetTarget(s.mattg)
 	e3:SetOperation(s.matop)
 	c:RegisterEffect(e3)
+	aux.RegisterMergedDelayedEvent(c,id,EVENT_SPSUMMON_SUCCESS)
 end
 function s.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return not e:GetHandler():IsReason(REASON_DRAW)