fix Auxiliary.AddDrytronSpSummonEffect

476cd6f4 · mercury233 · 3b78f024 · 476cd6f4 · 476cd6f4 · 476cd6f4
Commit 476cd6f4 authored Aug 02, 2021 by mercury233
6 changed files
--- a/c22420202.lua
+++ b/c22420202.lua
--竜輝巧－ルタδ
-function c22420202.initial_effect(c)
-	--spsummon condition
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
-	e1:SetValue(c22420202.splimit)
-	c:RegisterEffect(e1)
-	--spsummon
-	local e2=aux.AddDrytronSpSummonEffect(c,c22420202.extraop)
-	e2:SetDescription(aux.Stringid(22420202,0))
-	e2:SetCountLimit(1,22420202)
-end
-function c22420202.splimit(e,se,sp,st)
-	return se:GetHandler():IsSetCard(0x154)
-end
-function c22420202.drfilter(c)
-	return c:IsType(TYPE_RITUAL) and c:IsType(TYPE_MONSTER+TYPE_SPELL) and not c:IsPublic()
-end
-function c22420202.extraop(e,tp)
-	local g=Duel.GetMatchingGroup(c22420202.drfilter,tp,LOCATION_HAND,0,nil)
-	if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(22420202,1)) then
-		Duel.BreakEffect()
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
-		local sg=g:Select(tp,1,1,nil)
-		Duel.ConfirmCards(1-tp,sg)
-		Duel.ShuffleHand(tp)
-		Duel.Draw(tp,1,REASON_EFFECT)
-	end
-end
+--竜輝巧－ルタδ
+function c22420202.initial_effect(c)
+	--spsummon condition
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
+	e1:SetValue(c22420202.splimit)
+	c:RegisterEffect(e1)
+	--spsummon
+	local e2=aux.AddDrytronSpSummonEffect(c,c22420202.extraop)
+	e2:SetDescription(aux.Stringid(22420202,0))
+	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DRAW)
+	e2:SetCountLimit(1,22420202)
+end
+function c22420202.splimit(e,se,sp,st)
+	return se:GetHandler():IsSetCard(0x154)
+end
+function c22420202.drfilter(c)
+	return c:IsType(TYPE_RITUAL) and c:IsType(TYPE_MONSTER+TYPE_SPELL) and not c:IsPublic()
+end
+function c22420202.extraop(e,tp)
+	local g=Duel.GetMatchingGroup(c22420202.drfilter,tp,LOCATION_HAND,0,nil)
+	if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(22420202,1)) then
+		Duel.BreakEffect()
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
+		local sg=g:Select(tp,1,1,nil)
+		Duel.ConfirmCards(1-tp,sg)
+		Duel.ShuffleHand(tp)
+		Duel.Draw(tp,1,REASON_EFFECT)
+	end
+end
--- a/c33543890.lua
+++ b/c33543890.lua
--竜輝巧－ラスβ
-function c33543890.initial_effect(c)
-	--spsummon condition
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
-	e1:SetValue(c33543890.splimit)
-	c:RegisterEffect(e1)
-	--spsummon
-	local e2=aux.AddDrytronSpSummonEffect(c,c33543890.extraop)
-	e2:SetDescription(aux.Stringid(33543890,0))
-	e2:SetCountLimit(1,33543890)
-end
-function c33543890.splimit(e,se,sp,st)
-	return se:GetHandler():IsSetCard(0x154)
-end
-function c33543890.tgfilter(c)
-	return c:IsFaceup() and c:IsSetCard(0x154) and c:IsType(TYPE_MONSTER)
-end
-function c33543890.extraop(e,tp)
-	local g=Duel.GetMatchingGroup(c33543890.tgfilter,tp,LOCATION_REMOVED,0,nil)
-	if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(33543890,1)) then
-		Duel.BreakEffect()
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-		local sg=g:Select(tp,1,1,nil)
-		Duel.SendtoGrave(sg,REASON_EFFECT+REASON_RETURN)
-	end
-end
+--竜輝巧－ラスβ
+function c33543890.initial_effect(c)
+	--spsummon condition
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
+	e1:SetValue(c33543890.splimit)
+	c:RegisterEffect(e1)
+	--spsummon
+	local e2=aux.AddDrytronSpSummonEffect(c,c33543890.extraop)
+	e2:SetDescription(aux.Stringid(33543890,0))
+	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_TOGRAVE)
+	e2:SetCountLimit(1,33543890)
+end
+function c33543890.splimit(e,se,sp,st)
+	return se:GetHandler():IsSetCard(0x154)
+end
+function c33543890.tgfilter(c)
+	return c:IsFaceup() and c:IsSetCard(0x154) and c:IsType(TYPE_MONSTER)
+end
+function c33543890.extraop(e,tp)
+	local g=Duel.GetMatchingGroup(c33543890.tgfilter,tp,LOCATION_REMOVED,0,nil)
+	if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(33543890,1)) then
+		Duel.BreakEffect()
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
+		local sg=g:Select(tp,1,1,nil)
+		Duel.SendtoGrave(sg,REASON_EFFECT+REASON_RETURN)
+	end
+end
--- a/c60037599.lua
+++ b/c60037599.lua
--竜輝巧－エルγ
-function c60037599.initial_effect(c)
-	--spsummon condition
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
-	e1:SetValue(c60037599.splimit)
-	c:RegisterEffect(e1)
-	--spsummon
-	local e2=aux.AddDrytronSpSummonEffect(c,c60037599.extraop)
-	e2:SetDescription(aux.Stringid(60037599,0))
-	e2:SetCountLimit(1,60037599)
-end
-function c60037599.splimit(e,se,sp,st)
-	return se:GetHandler():IsSetCard(0x154)
-end
-function c60037599.rbfilter(c,e,tp)
-	return c:IsSetCard(0x154) and c:IsAttack(2000) and not c:IsCode(60037599) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
-end
-function c60037599.extraop(e,tp)
-	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(c60037599.rbfilter),tp,LOCATION_GRAVE,0,nil,e,tp)
-	if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(60037599,1)) then
-		Duel.BreakEffect()
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-		local sg=g:Select(tp,1,1,nil)
-		Duel.SpecialSummon(sg,0,tp,tp,false,false,POS_FACEUP)
-	end
-end
+--竜輝巧－エルγ
+function c60037599.initial_effect(c)
+	--spsummon condition
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
+	e1:SetValue(c60037599.splimit)
+	c:RegisterEffect(e1)
+	--spsummon
+	local e2=aux.AddDrytronSpSummonEffect(c,c60037599.extraop)
+	e2:SetDescription(aux.Stringid(60037599,0))
+	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_GRAVE_SPSUMMON)
+	e2:SetCountLimit(1,60037599)
+end
+function c60037599.splimit(e,se,sp,st)
+	return se:GetHandler():IsSetCard(0x154)
+end
+function c60037599.rbfilter(c,e,tp)
+	return c:IsSetCard(0x154) and c:IsAttack(2000) and not c:IsCode(60037599) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+end
+function c60037599.extraop(e,tp)
+	local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(c60037599.rbfilter),tp,LOCATION_GRAVE,0,nil,e,tp)
+	if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(60037599,1)) then
+		Duel.BreakEffect()
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
+		local sg=g:Select(tp,1,1,nil)
+		Duel.SpecialSummon(sg,0,tp,tp,false,false,POS_FACEUP)
+	end
+end
--- a/c96026108.lua
+++ b/c96026108.lua
--竜輝巧－アルζ
-function c96026108.initial_effect(c)
-	--spsummon condition
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
-	e1:SetValue(c96026108.splimit)
-	c:RegisterEffect(e1)
-	--spsummon
-	local e2=aux.AddDrytronSpSummonEffect(c,c96026108.extraop)
-	e2:SetDescription(aux.Stringid(96026108,0))
-	e2:SetCountLimit(1,96026108)
-end
-function c96026108.splimit(e,se,sp,st)
-	return se:GetHandler():IsSetCard(0x154)
-end
-function c96026108.thfilter(c)
-	return c:IsType(TYPE_RITUAL) and c:IsType(TYPE_SPELL) and c:IsAbleToHand()
-end
-function c96026108.extraop(e,tp)
-	local g=Duel.GetMatchingGroup(c96026108.thfilter,tp,LOCATION_DECK,0,nil)
-	if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(96026108,1)) then
-		Duel.BreakEffect()
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-		local sg=g:Select(tp,1,1,nil)
-		Duel.SendtoHand(sg,nil,REASON_EFFECT)
-		Duel.ConfirmCards(1-tp,sg)
-	end
-end
+--竜輝巧－アルζ
+function c96026108.initial_effect(c)
+	--spsummon condition
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
+	e1:SetValue(c96026108.splimit)
+	c:RegisterEffect(e1)
+	--spsummon
+	local e2=aux.AddDrytronSpSummonEffect(c,c96026108.extraop)
+	e2:SetDescription(aux.Stringid(96026108,0))
+	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_SEARCH)
+	e2:SetCountLimit(1,96026108)
+end
+function c96026108.splimit(e,se,sp,st)
+	return se:GetHandler():IsSetCard(0x154)
+end
+function c96026108.thfilter(c)
+	return c:IsType(TYPE_RITUAL) and c:IsType(TYPE_SPELL) and c:IsAbleToHand()
+end
+function c96026108.extraop(e,tp)
+	local g=Duel.GetMatchingGroup(c96026108.thfilter,tp,LOCATION_DECK,0,nil)
+	if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(96026108,1)) then
+		Duel.BreakEffect()
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
+		local sg=g:Select(tp,1,1,nil)
+		Duel.SendtoHand(sg,nil,REASON_EFFECT)
+		Duel.ConfirmCards(1-tp,sg)
+	end
+end
--- a/c97148796.lua
+++ b/c97148796.lua
--竜輝巧－バンα
-function c97148796.initial_effect(c)
-	--spsummon condition
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
-	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
-	e1:SetValue(c97148796.splimit)
-	c:RegisterEffect(e1)
-	--spsummon
-	local e2=aux.AddDrytronSpSummonEffect(c,c97148796.extraop)
-	e2:SetDescription(aux.Stringid(97148796,0))
-	e2:SetCountLimit(1,97148796)
-end
-function c97148796.splimit(e,se,sp,st)
-	return se:GetHandler():IsSetCard(0x154)
-end
-function c97148796.thfilter(c)
-	return c:IsType(TYPE_RITUAL) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
-end
-function c97148796.extraop(e,tp)
-	local g=Duel.GetMatchingGroup(c97148796.thfilter,tp,LOCATION_DECK,0,nil)
-	if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(97148796,1)) then
-		Duel.BreakEffect()
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-		local sg=g:Select(tp,1,1,nil)
-		Duel.SendtoHand(sg,nil,REASON_EFFECT)
-		Duel.ConfirmCards(1-tp,sg)
-	end
-end
+--竜輝巧－バンα
+function c97148796.initial_effect(c)
+	--spsummon condition
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_SINGLE)
+	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
+	e1:SetCode(EFFECT_SPSUMMON_CONDITION)
+	e1:SetValue(c97148796.splimit)
+	c:RegisterEffect(e1)
+	--spsummon
+	local e2=aux.AddDrytronSpSummonEffect(c,c97148796.extraop)
+	e2:SetDescription(aux.Stringid(97148796,0))
+	e2:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_SEARCH)
+	e2:SetCountLimit(1,97148796)
+end
+function c97148796.splimit(e,se,sp,st)
+	return se:GetHandler():IsSetCard(0x154)
+end
+function c97148796.thfilter(c)
+	return c:IsType(TYPE_RITUAL) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
+end
+function c97148796.extraop(e,tp)
+	local g=Duel.GetMatchingGroup(c97148796.thfilter,tp,LOCATION_DECK,0,nil)
+	if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(97148796,1)) then
+		Duel.BreakEffect()
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
+		local sg=g:Select(tp,1,1,nil)
+		Duel.SendtoHand(sg,nil,REASON_EFFECT)
+		Duel.ConfirmCards(1-tp,sg)
+	end
+end
--- a/utility.lua
+++ b/utility.lua
@@ -2444,7 +2444,6 @@ end
 --Drytron common summon effect
 function Auxiliary.AddDrytronSpSummonEffect(c,func)
 	local e1=Effect.CreateEffect(c)
-	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_SEARCH)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_HAND+LOCATION_GRAVE)
 	e1:SetCost(Auxiliary.DrytronSpSummonCost)