ndyd

expansions/script/c18003012.lua

@@ -41,11 +41,12 @@ end
 function c18003012.con(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsSummonLocation(LOCATION_EXTRA)
 end
-function c18003012.cfilter(c,tp)
-	return c:IsFaceup() and c:IsSetCard(0x36e1) and c:IsSummonLocation(LOCATION_EXTRA)
+function c18003012.cfilter(c,e,tp)
+	return c:IsFaceup() and c:IsSetCard(0x36e1)
+			and c:IsSummonLocation(LOCATION_EXTRA) and c:IsControler(tp)
 end
 function c18003012.rmcon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c18003012.cfilter,1,nil,tp)
+	return not eg:IsContains(e:GetHandler()) and eg:IsExists(c18003012.cfilter,1,nil,tp)
 end
 function c18003012.thfilter(c)
 	return c:IsSetCard(0x36e1) and c:IsAbleToHand()

expansions/script/c45745916.lua

@@ -7,7 +7,7 @@ function c45745916.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(45745916,0))
 	e1:SetCategory(CATEGORY_HANDES)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_0)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e1:SetCountLimit(1,45745916)