ndyd

expansions/script/c20000101.lua

@@ -84,14 +84,15 @@ function c20000101.tg3(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chkc then return end
 	if chk==0 then return Duel.IsExistingTarget(c20000101.tgf3,tp,LOCATION_GRAVE,0,1,nil,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	local g=Duel.SelectTarget(tp,c20000101.tgf3,tp,LOCATION_GRAVE,0,1,1,nil,tp)
+	local g=Duel.SelectTarget(tp,aux.NecroValleyFilter(c20000101.tgf3),tp,LOCATION_GRAVE,0,1,1,nil,tp)
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,1,tp,LOCATION_GRAVE)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,0)
 end
 function c20000101.op3(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) and Duel.SendtoHand(tc,tp,REASON_EFFECT)~=0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 then
-		if Duel.SelectYesNo(tp,aux.Stringid(20000101,3)) then
+		local g=Duel.GetMatchingGroup(c20000101.opf3,tp,LOCATION_HAND,0,nil,e,tp)
+		if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(20000101,3)) then
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 			local g=Duel.SelectMatchingCard(tp,c20000101.opf3,tp,LOCATION_HAND,0,1,1,nil,e,tp)
 			Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)

expansions/script/c20000105.lua

@@ -11,7 +11,7 @@ function c20000105.initial_effect(c)
 	e2:SetOperation(c20000105.op2)
 	c:RegisterEffect(e2)
 	local e3=Effect.CreateEffect(c)
-	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e3:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOHAND+CATEGORY_DRAW+CATEGORY_SEARCH)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_QUICK_F)
 	e3:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e3:SetCountLimit(1,20000105)
@@ -68,7 +68,7 @@ function c20000105.op3(e,tp,eg,ep,ev,re,r,rp)
 		 Duel.Draw(tp,1,REASON_EFFECT)
 	 else
 		 Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-		 local g=Duel.SelectMatchingCard(tp,c20000105.opf32,tp,LOCATION_GRAVE+LOCATION_DECK,0,1,1,nil)
+		 local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c20000105.opf32),tp,LOCATION_GRAVE+LOCATION_DECK,0,1,1,nil)
 		 Duel.SendtoHand(g,tp,REASON_EFFECT)
 		 Duel.ConfirmCards(1-tp,g)
 		 end

expansions/script/c20000106.lua

@@ -11,7 +11,7 @@ function c20000106.initial_effect(c)
 	e2:SetOperation(c20000106.op2)
 	c:RegisterEffect(e2)
 	local e3=Effect.CreateEffect(c)
-	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e3:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_QUICK_F)
 	e3:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e3:SetCountLimit(1,20000106)
@@ -74,7 +74,7 @@ function c20000106.op3(e,tp,eg,ep,ev,re,r,rp)
 		 Duel.ConfirmCards(1-tp,g)
 	 else
 		 Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-		 local g=Duel.SelectMatchingCard(tp,c20000106.opf32,tp,LOCATION_GRAVE+LOCATION_DECK,0,1,1,nil)
+		 local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c20000106.opf32),tp,LOCATION_GRAVE+LOCATION_DECK,0,1,1,nil)
 		 Duel.SendtoHand(g,tp,REASON_EFFECT)
 		 Duel.ConfirmCards(1-tp,g)
 		 end

expansions/script/c20000107.lua

@@ -11,7 +11,7 @@ function c20000107.initial_effect(c)
 	e2:SetOperation(c20000107.op2)
 	c:RegisterEffect(e2)
 	local e3=Effect.CreateEffect(c)
-	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e3:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_QUICK_F)
 	e3:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e3:SetCountLimit(1,20000107)
@@ -74,7 +74,7 @@ function c20000107.op3(e,tp,eg,ep,ev,re,r,rp)
 		 Duel.ConfirmCards(1-tp,g)
 	 else
 		 Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-		 local g=Duel.SelectMatchingCard(tp,c20000107.opf32,tp,LOCATION_GRAVE+LOCATION_DECK,0,1,1,nil)
+		 local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c20000107.opf32),tp,LOCATION_GRAVE+LOCATION_DECK,0,1,1,nil)
 		 Duel.SendtoHand(g,tp,REASON_EFFECT)
 		 Duel.ConfirmCards(1-tp,g)
 		 end

expansions/script/c20000108.lua

@@ -11,7 +11,7 @@ function c20000108.initial_effect(c)
 	e2:SetOperation(c20000108.op2)
 	c:RegisterEffect(e2)
 	local e3=Effect.CreateEffect(c)
-	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e3:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_QUICK_F)
 	e3:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e3:SetCountLimit(1,20000108)
@@ -75,7 +75,7 @@ function c20000108.op3(e,tp,eg,ep,ev,re,r,rp)
 		 Duel.ConfirmCards(1-tp,g)
 	 else
 		 Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-		 local g=Duel.SelectMatchingCard(tp,c20000108.opf32,tp,LOCATION_GRAVE+LOCATION_DECK,0,1,1,nil)
+		 local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c20000108.opf32),tp,LOCATION_GRAVE+LOCATION_DECK,0,1,1,nil)
 		 Duel.SendtoHand(g,tp,REASON_EFFECT)
 		 Duel.ConfirmCards(1-tp,g)
 		 end

expansions/script/c20000109.lua

@@ -11,7 +11,7 @@ function c20000109.initial_effect(c)
 	e2:SetOperation(c20000109.op2)
 	c:RegisterEffect(e2)
 	local e3=Effect.CreateEffect(c)
-	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e3:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_QUICK_F)
 	e3:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e3:SetCountLimit(1,20000109)
@@ -75,7 +75,7 @@ function c20000109.op3(e,tp,eg,ep,ev,re,r,rp)
 		 Duel.ConfirmCards(1-tp,g)
 	 else
 		 Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-		 local g=Duel.SelectMatchingCard(tp,c20000109.opf32,tp,LOCATION_GRAVE+LOCATION_DECK,0,1,1,nil)
+		 local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c20000109.opf32),tp,LOCATION_GRAVE+LOCATION_DECK,0,1,1,nil)
 		 Duel.SendtoHand(g,tp,REASON_EFFECT)
 		 Duel.ConfirmCards(1-tp,g)
 		 end

expansions/script/c20000110.lua

@@ -11,7 +11,7 @@ function c20000110.initial_effect(c)
 	e2:SetOperation(c20000110.op2)
 	c:RegisterEffect(e2)
 	local e3=Effect.CreateEffect(c)
-	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e3:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_QUICK_F)
 	e3:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e3:SetCountLimit(1,20000110)
@@ -75,7 +75,7 @@ function c20000110.op3(e,tp,eg,ep,ev,re,r,rp)
 		 Duel.ConfirmCards(1-tp,g)
 	 else
 		 Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-		 local g=Duel.SelectMatchingCard(tp,c20000110.opf32,tp,LOCATION_GRAVE+LOCATION_DECK,0,1,1,nil)
+		 local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c20000110.opf32),tp,LOCATION_GRAVE+LOCATION_DECK,0,1,1,nil)
 		 Duel.SendtoHand(g,tp,REASON_EFFECT)
 		 Duel.ConfirmCards(1-tp,g)
 		 end

expansions/script/c20000111.lua

@@ -13,7 +13,7 @@ function c20000111.initial_effect(c)
 	e1:SetOperation(c20000111.op1)
 	c:RegisterEffect(e1)
 	local e3=Effect.CreateEffect(c)
-	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
+	e3:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e3:SetType(EFFECT_TYPE_IGNITION)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCountLimit(1,20000111)
@@ -95,7 +95,7 @@ function c20000111.op3(e,tp,eg,ep,ev,re,r,rp)
 				Duel.ConfirmCards(1-tp,g)
 			else
 				Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-				local g=Duel.SelectMatchingCard(tp,c20000111.opf32,tp,LOCATION_GRAVE+LOCATION_DECK,0,1,1,nil)
+				local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c20000111.opf32),tp,LOCATION_GRAVE+LOCATION_DECK,0,1,1,nil)
 				Duel.SendtoHand(g,tp,REASON_EFFECT)
 				Duel.ConfirmCards(1-tp,g)
 			end

expansions/script/c20000112.lua

@@ -8,12 +8,26 @@ function c20000112.initial_effect(c)
 	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetCode(EFFECT_DISABLE)
+	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e2:SetCode(EVENT_CHAINING)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetTargetRange(0,0xff)
-	e2:SetTarget(c20000112.tg2)
+	e2:SetCondition(function(e,tp,eg,ep,ev,re,r,rp,chk)
+		return re:IsActiveType(TYPE_EFFECT) and re:GetHandler():IsType(TYPE_XYZ) and ep~=tp
+	end)
+	e2:SetOperation(function(e,tp,eg,ep,ev,re,r,rp)
+		Duel.NegateEffect(ev)
+	end)
 	c:RegisterEffect(e2)
+	local e6=Effect.CreateEffect(c)
+	e6:SetType(EFFECT_TYPE_FIELD)
+	e6:SetRange(LOCATION_MZONE)
+	e6:SetTargetRange(0,0xff)
+	e6:SetTarget(c20000112.tg2)
+	e6:SetCode(EFFECT_DISABLE)
+	c:RegisterEffect(e6)
+	local e7=e6:Clone(c)
+	e7:SetCode(EFFECT_DISABLE_EFFECT)
+	c:RegisterEffect(e7)
 	local e4=Effect.CreateEffect(c)
 	e4:SetCategory(CATEGORY_DISABLE)
 	e4:SetType(EFFECT_TYPE_QUICK_O)

expansions/script/c20000113.lua

@@ -8,12 +8,26 @@ function c20000113.initial_effect(c)
 	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetCode(EFFECT_DISABLE)
+	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e2:SetCode(EVENT_CHAINING)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetTargetRange(0,0xfdd)
-	e2:SetTarget(c20000113.tg2)
+	e2:SetCondition(function(e,tp,eg,ep,ev,re,r,rp,chk)
+		return re:IsActiveType(TYPE_EFFECT) and re:GetHandler():IsType(TYPE_FUSION) and ep~=tp
+	end)
+	e2:SetOperation(function(e,tp,eg,ep,ev,re,r,rp)
+		Duel.NegateEffect(ev)
+	end)
 	c:RegisterEffect(e2)
+	local e6=Effect.CreateEffect(c)
+	e6:SetType(EFFECT_TYPE_FIELD)
+	e6:SetRange(LOCATION_MZONE)
+	e6:SetTargetRange(0,0xff)
+	e6:SetTarget(c20000113.tg2)
+	e6:SetCode(EFFECT_DISABLE)
+	c:RegisterEffect(e6)
+	local e7=e6:Clone(c)
+	e7:SetCode(EFFECT_DISABLE_EFFECT)
+	c:RegisterEffect(e7)
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(20000113,0))
 	e4:SetCategory(CATEGORY_DISABLE)

expansions/script/c20000114.lua

@@ -8,12 +8,26 @@ function c20000114.initial_effect(c)
 	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetCode(EFFECT_DISABLE)
+	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e2:SetCode(EVENT_CHAINING)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetTargetRange(0,0xff)
-	e2:SetTarget(c20000114.tg2)
+	e2:SetCondition(function(e,tp,eg,ep,ev,re,r,rp,chk)
+		return re:IsActiveType(TYPE_EFFECT) and re:GetHandler():IsType(TYPE_SYNCHRO) and ep~=tp
+	end)
+	e2:SetOperation(function(e,tp,eg,ep,ev,re,r,rp)
+		Duel.NegateEffect(ev)
+	end)
 	c:RegisterEffect(e2)
+	local e6=Effect.CreateEffect(c)
+	e6:SetType(EFFECT_TYPE_FIELD)
+	e6:SetRange(LOCATION_MZONE)
+	e6:SetTargetRange(0,0xff)
+	e6:SetTarget(c20000114.tg2)
+	e6:SetCode(EFFECT_DISABLE)
+	c:RegisterEffect(e6)
+	local e7=e6:Clone(c)
+	e7:SetCode(EFFECT_DISABLE_EFFECT)
+	c:RegisterEffect(e7)
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(20000114,0))
 	e4:SetCategory(CATEGORY_DISABLE)

expansions/script/c20000116.lua

@@ -9,12 +9,26 @@ function c20000116.initial_effect(c)
 	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetCode(EFFECT_DISABLE)
+	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e2:SetCode(EVENT_CHAINING)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetTargetRange(0,0xff)
-	e2:SetTarget(c20000116.tg2)
+	e2:SetCondition(function(e,tp,eg,ep,ev,re,r,rp,chk)
+		return re:IsActiveType(TYPE_EFFECT) and re:GetHandler():IsType(TYPE_PENDULUM) and ep~=tp
+	end)
+	e2:SetOperation(function(e,tp,eg,ep,ev,re,r,rp)
+		Duel.NegateEffect(ev)
+	end)
 	c:RegisterEffect(e2)
+	local e6=Effect.CreateEffect(c)
+	e6:SetType(EFFECT_TYPE_FIELD)
+	e6:SetRange(LOCATION_MZONE)
+	e6:SetTargetRange(0,0xff)
+	e6:SetTarget(c20000116.tg2)
+	e6:SetCode(EFFECT_DISABLE)
+	c:RegisterEffect(e6)
+	local e7=e6:Clone(c)
+	e7:SetCode(EFFECT_DISABLE_EFFECT)
+	c:RegisterEffect(e7)
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(20000116,0))
 	e4:SetCategory(CATEGORY_REMOVE)
@@ -37,15 +51,15 @@ function c20000116.initial_effect(c)
 	e5:SetCost(c20000116.co5)
 	e5:SetOperation(c20000116.op5)
 	c:RegisterEffect(e5)
-	local e6=Effect.CreateEffect(c)
-	e6:SetDescription(aux.Stringid(20000116,2))
-	e6:SetCategory(CATEGORY_TOHAND+CATEGORY_TODECK+CATEGORY_HANDES)
-	e6:SetType(EFFECT_TYPE_IGNITION)
-	e6:SetRange(LOCATION_PZONE)
-	e6:SetCost(c20000116.co6)
-	e6:SetTarget(c20000116.tg6)
-	e6:SetOperation(c20000116.op6)
-	c:RegisterEffect(e6)
+	local e8=Effect.CreateEffect(c)
+	e8:SetDescription(aux.Stringid(20000116,2))
+	e8:SetCategory(CATEGORY_TOHAND+CATEGORY_TODECK+CATEGORY_HANDES)
+	e8:SetType(EFFECT_TYPE_IGNITION)
+	e8:SetRange(LOCATION_PZONE)
+	e8:SetCost(c20000116.co6)
+	e8:SetTarget(c20000116.tg6)
+	e8:SetOperation(c20000116.op6)
+	c:RegisterEffect(e8)
 end
 --e2
 function c20000116.tg2(e,c)

expansions/script/c20000117.lua

@@ -8,12 +8,26 @@ function c20000117.initial_effect(c)
 	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
 	c:RegisterEffect(e1)
 	local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_FIELD)
-	e2:SetCode(EFFECT_DISABLE)
+	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e2:SetCode(EVENT_CHAINING)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetTargetRange(0,0xff)
-	e2:SetTarget(c20000117.tg2)
+	e2:SetCondition(function(e,tp,eg,ep,ev,re,r,rp,chk)
+		return re:IsActiveType(TYPE_EFFECT) and re:GetHandler():IsType(TYPE_RITUAL) and ep~=tp
+	end)
+	e2:SetOperation(function(e,tp,eg,ep,ev,re,r,rp)
+		Duel.NegateEffect(ev)
+	end)
 	c:RegisterEffect(e2)
+	local e6=Effect.CreateEffect(c)
+	e6:SetType(EFFECT_TYPE_FIELD)
+	e6:SetRange(LOCATION_MZONE)
+	e6:SetTargetRange(0,0xff)
+	e6:SetTarget(c20000117.tg2)
+	e6:SetCode(EFFECT_DISABLE)
+	c:RegisterEffect(e6)
+	local e7=e6:Clone(c)
+	e7:SetCode(EFFECT_DISABLE_EFFECT)
+	c:RegisterEffect(e7)
 	local e4=Effect.CreateEffect(c)
 	e4:SetType(EFFECT_TYPE_QUICK_O)
 	e4:SetCode(EVENT_CHAINING)

expansions/script/c20000122.lua

@@ -29,7 +29,8 @@ function cm.initial_effect(c)
 		end
 	end)
 	e1:SetOperation(function(e,tp,eg,ep,ev,re,r,rp)
-		if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) then
+		Duel.NegateActivation(ev)
+		if re:GetHandler():IsRelateToEffect(re) then
 			if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 			local tc=Duel.SelectMatchingCard(tp,cm.cof12,tp,LOCATION_HAND+LOCATION_EXTRA,0,1,1,nil,e,tp,e:GetLabel()):GetFirst()