ndyd

expansions/script/c60002004.lua

@@ -14,6 +14,7 @@ function c60002004.initial_effect(c)
 	e1:SetCost(c60002004.spcost)
 	e1:SetTarget(c60002004.sptg)
 	e1:SetOperation(c60002004.spop)
+	c:RegisterEffect(e1)
 	--immunity
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(60303245,0))
@@ -29,7 +30,7 @@ function c60002004.matfilter(c)
 	return c:IsCode(98818516) and not c:IsType(TYPE_LINK)
 end
 function c60002004.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return true end
+	if chk==0 then return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) end
 	Duel.SelectOption(tp,aux.Stringid(60002004,0))
 	Duel.Hint(HINT_MESSAGE,1-tp,aux.Stringid(60002004,0))
 end
@@ -60,7 +61,7 @@ function c60002004.splimit(e,c)
 	return not c:IsAttribute(ATTRIBUTE_EARTH)
 end
 function c60002004.immtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) and Duel.IsExistingTarget(aux.TRUE,tp,LOCATION_MZONE,0,1,e:GetHandler()) end
+	if chk==0 then return not e:GetHandler():IsSummonType(SUMMON_TYPE_LINK) and Duel.IsExistingTarget(aux.TRUE,tp,LOCATION_MZONE,0,1,e:GetHandler()) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
 	Duel.SelectTarget(tp,aux.TRUE,tp,LOCATION_MZONE,0,1,1,nil)
 end

expansions/script/c60002006.lua

@@ -4,7 +4,7 @@ function c60002006.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetCountLimit(1,60002007+EFFECT_COUNT_CODE_OATH)
+	e1:SetCountLimit(1,60002006+EFFECT_COUNT_CODE_OATH)
 	c:RegisterEffect(e1)
 	--Activate
 	local e1=Effect.CreateEffect(c)
@@ -73,7 +73,7 @@ function c60002006.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToDeckAsCost() end
 	Duel.SelectOption(tp,aux.Stringid(60002006,0))
 	Duel.Hint(HINT_MESSAGE,1-tp,aux.Stringid(60002006,0))
-	Duel.SendtoDeck(e:GetHandler(),nil,REASON_COST)
+	Duel.SendtoDeck(e:GetHandler(),nil,2,REASON_COST)
 end
 function c60002006.spfil(c,e,tp)
 	return c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsCode(98818516)

expansions/script/c60002007.lua

@@ -63,18 +63,18 @@ function c60002007.spcost1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToDeckAsCost() end
 	Duel.SelectOption(tp,aux.Stringid(60002007,1))
 	Duel.Hint(HINT_MESSAGE,1-tp,aux.Stringid(60002007,1))
-	Duel.SendtoDeck(e:GetHandler(),nil,REASON_COST)
+	Duel.SendtoDeck(e:GetHandler(),nil,2,REASON_COST)
 end
 function c60002007.spfil1(c,e,tp)
 	return c:IsCanBeSpecialSummoned(e,0,tp,false,false) and c:IsSetCard(0x623)
 end
 function c60002007.sptg1(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c60002007.spfil1,tp,LOCATION_GRAVE,0,1,nil,e,tp) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE)
+	if chk==0 then return Duel.IsExistingMatchingCard(c60002007.spfil1,tp,LOCATION_GRAVE+LOCATION_HAND,0,1,nil,e,tp) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE+LOCATION_HAND)
 end
 function c60002007.spop1(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	local g=Duel.GetMatchingGroup(c60002007.spfil1,tp,LOCATION_GRAVE,0,nil,e,tp)
+	local g=Duel.GetMatchingGroup(c60002007.spfil1,tp,LOCATION_GRAVE+LOCATION_HAND,0,nil,e,tp)
 	if g:GetCount()<=0 or Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local sg=g:Select(tp,1,1,nil)