wadashimo

expansions/script/c65050221.lua

@@ -51,7 +51,7 @@ function c65050221.tgfil(c,e,tp)
 	return c:IsSetCard(0x5da9) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) 
 end
 function c65050221.tg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c65050221.tgfil,tp,LOCATION_GRAVE,0,1,nil,e,tp) and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.GetMZoneCount(tp)>1 end
+	if chk==0 then return Duel.IsExistingMatchingCard(c65050221.tgfil,tp,LOCATION_HAND,0,1,nil,e,tp) and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) and Duel.GetMZoneCount(tp)>1 end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
 end

expansions/script/c65050231.lua

@@ -10,20 +10,8 @@ function c65050231.initial_effect(c)
 	e1:SetTarget(c65050231.target)
 	e1:SetOperation(c65050231.activate)
 	c:RegisterEffect(e1)
-	--RaiseEvent
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e3:SetCode(EVENT_LEVEL_UP)
-	e3:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE)
-	e3:SetOperation(c65050231.raop)
-	c:RegisterEffect(e3)
 end
-function c65050231.raop(e,tp,eg,ep,ev,re,r,rp)
-	if e:GetHandler():IsLocation(LOCATION_MZONE) then
-	Duel.RaiseEvent(e:GetHandler(),EVENT_CUSTOM+65050216,e,0,tp,0,0)
-	end
-end
-function c65050231.costfil(c)
+function c65050231.costfil(c,tp)
 	return Duel.IsExistingMatchingCard(c65050231.thfil,tp,LOCATION_DECK,0,1,nil,c:GetCode()) and c:IsSetCard(0x5da9) and c:IsAbleToHand()
 end
 function c65050231.ccostfil(c)
@@ -39,7 +27,7 @@ function c65050231.lvfil(c)
 	return c:IsSetCard(0x5da9) and c:IsFaceup() and c:IsLevelAbove(3)
 end
 function c65050231.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	local b1=Duel.IsExistingMatchingCard(c65050231.costfil,tp,LOCATION_DECK,0,1,nil)
+	local b1=Duel.IsExistingMatchingCard(c65050231.costfil,tp,LOCATION_DECK,0,1,nil,tp)
 	local b01=Duel.IsExistingMatchingCard(c65050231.ccostfil,tp,LOCATION_DECK,0,1,nil)
 	local b2=Duel.IsExistingMatchingCard(c65050231.lvfil,tp,LOCATION_MZONE,0,1,nil)
 	local b02=Duel.IsExistingMatchingCard(c65050231.clvfil,tp,LOCATION_MZONE,0,1,nil)