nmbd

expansions/script/c16107110.lua

@@ -56,7 +56,7 @@ function cm.splimit(e,c)
 end
 ----
 function cm.sumfilter(c,e,tp,att)
-	return (c:IsSetCard(0x5ccc) or (c:IsRace(RACE_MACHINE) and c:IsLevel(10))) and not c:IsAttribute(att) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and not c:IsAttribute(table.unpack(Sr_GODback))
+	return (c:IsSetCard(0x5ccc) or (c:IsRace(RACE_MACHINE) and c:IsLevel(10))) and not c:IsAttribute(att) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and not rsof.Table_List(Sr_GODback,c:GetAttribute())
 end
 function cm.spmfilter(c,e,tp)
 	local att=c:GetAttribute()

expansions/script/c16130004.lua

@@ -41,7 +41,7 @@ function cm.gfilter(c)
 	return c:IsType(TYPE_MONSTER) and not c:IsRace(RACE_ZOMBIE)
 end
 function cm.spfilter(c,e,tp)
-	return ((rk.check(m,"BOW")) or (not Duel.IsExistingMatchingCard(cm.gfilter,tp,LOCATION_GRAVE,0,1,nil) and c:IsRace(RACE_ZOMBIE))) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and not c:IsCode(m)
+	return ((rk.check(c,"BOW")) or (not Duel.IsExistingMatchingCard(cm.gfilter,tp,LOCATION_GRAVE,0,1,nil) and c:IsRace(RACE_ZOMBIE))) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and not c:IsCode(m)
 end
 function cm.sptg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and cm.spfilter(chkc,e,tp) end

expansions/script/c16130006.lua

@@ -83,11 +83,11 @@ function cm.spcon(e,c)
 	if c==nil then return true end
 	local tp=c:GetControler()
 	local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
-	local g=Duel.GetMatchingGroup(cm.spcost,c:GetControler(),LOCATION_ONFIELD,0,nil)
+	local g=Duel.GetMatchingGroup(cm.spcost,c:GetControler(),LOCATION_GRAVE,0,e:GetHandler())
 	return g:GetCount()>0 and ft>0
 end
 function cm.spop(e,tp,eg,ep,ev,re,r,rp,c)
-	local g=Duel.GetMatchingGroup(cm.spcost,c:GetControler(),LOCATION_ONFIELD,0,nil)
+	local g=Duel.GetMatchingGroup(cm.spcost,c:GetControler(),LOCATION_GRAVE,0,e:GetHandler())
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	aux.GCheckAdditional=aux.dncheck
 	local rg=g:SelectSubGroup(tp,aux.mzctcheck,false,1,1,tp)

expansions/script/c16400026.lua

@@ -10,7 +10,7 @@ function c16400026.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(m,0))
 	e2:SetCategory(CATEGORY_REMOVE)
-	e2:SetType(EFFECT_TYPE_ACTIVATE)
+	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetCondition(cm.con)
@@ -25,11 +25,12 @@ function c16400026.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e3:SetCode(EVENT_ATTACK_ANNOUNCE)
 	e3:SetRange(LOCATION_SZONE)
+	e3:SetCountLimit(1)
 	e3:SetLabel(1)
 	e3:SetCondition(cm.condition)
 	e3:SetTarget(cm.target2)
 	e3:SetOperation(cm.activate)
-	c:RegisterEffect(e2)
+	c:RegisterEffect(e3)
 end
 function cm.con(e,tp,eg,ep,ev,re,r,rp)
 	local sp=Duel.GetTurnPlayer()

expansions/script/c16400028.lua

@@ -87,7 +87,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RegisterFlagEffect(tp,m+11,RESET_PHASE+PHASE_END,0,1)
 end
 function cm.filter(c)
-	return c:IsCanOverlay()
+	return c:IsCanOverlay() and c:IsFaceup()
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_ONFIELD) and cm.filter(chkc) end

expansions/script/c16400037.lua

@@ -96,7 +96,7 @@ function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	local g=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_GRAVE,0,1,1,e:GetHandler())
+	local g=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_GRAVE,0,3,3,e:GetHandler())
 	if g:GetCount()>0 then
 		Duel.SendtoDeck(g,nil,2,REASON_EFFECT)
 	end

expansions/script/c16400039.lua

@@ -24,8 +24,8 @@ function cm.thop(e,tp)
 end
 function cm.solvefun(g,tp)
 	local tc=g:GetFirst()
-	local b1=c:IsType(TYPE_NORMAL) and c:IsRace(RACE_WARRIOR) and c:IsAbleToHand()
-	local b2=c:IsSetCard(0xce2) and c:IsAbleToGrave()
+	local b1=tc:IsType(TYPE_NORMAL) and tc:IsRace(RACE_WARRIOR) and tc:IsAbleToHand()
+	local b2=tc:IsSetCard(0xce2) and tc:IsAbleToGrave()
 	if b1 then
 		Duel.SendtoHand(tc,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,tc)
@@ -41,7 +41,7 @@ function cm.thop1(e,tp)
 end
 function cm.solvefun1(g,tp)
 	local tc=g:GetFirst()
-	local b1=c:IsSetCard(0xce2) and c:IsAbleToHand() and (c:IsType(TYPE_TRAP) or c:IsType(TYPE_SPELL))
+	local b1=tc:IsSetCard(0xce2) and tc:IsAbleToHand() and (tc:IsType(TYPE_TRAP) or tc:IsType(TYPE_SPELL))
 	if b1 then
 		Duel.SendtoHand(tc,nil,REASON_EFFECT)
 		Duel.ConfirmCards(1-tp,tc)

expansions/script/c33331554.lua

@@ -20,6 +20,7 @@ function c33331554.initial_effect(c)
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_IGNITION)
 	e2:SetRange(LOCATION_FZONE)
+	e2:SetCountLimit(1)
 	e2:SetCondition(c33331554.con2)
 	e2:SetTarget(c33331554.tg2)
 	e2:SetOperation(c33331554.op2)
@@ -74,18 +75,18 @@ end
 function c33331554.val2_1(e)
 	local tp=e:GetOwnerPlayer()
 	local val1,val2,val3,val4=0,0,0,0
---	if Duel.CheckLocation(tp,LOCATION_MZONE,0) then
+--  if Duel.CheckLocation(tp,LOCATION_MZONE,0) then
 		val1=aux.SequenceToGlobal(tp,LOCATION_MZONE,0)
---	end
---	if Duel.CheckLocation(tp,LOCATION_MZONE,1) then
+--  end
+--  if Duel.CheckLocation(tp,LOCATION_MZONE,1) then
 		val2=aux.SequenceToGlobal(tp,LOCATION_MZONE,1)
---	end
---	if Duel.CheckLocation(tp,LOCATION_MZONE,3) then
+--  end
+--  if Duel.CheckLocation(tp,LOCATION_MZONE,3) then
 		val3=aux.SequenceToGlobal(tp,LOCATION_MZONE,3)
---	end
---	if Duel.CheckLocation(tp,LOCATION_MZONE,4) then
+--  end
+--  if Duel.CheckLocation(tp,LOCATION_MZONE,4) then
 		val4=aux.SequenceToGlobal(tp,LOCATION_MZONE,4)
---	end
+--  end
 	return val1|val2|val3|val4
 end
 --
\ No newline at end of file

expansions/script/c33331557.lua

@@ -37,16 +37,17 @@ function c33331557.tg2(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c33331557.tfilter2,tp,LOCATION_DECK,0,1,nil) end
 end
 function c33331557.op2(e,tp,eg,ep,ev,re,r,rp)
+	tp=e:GetHandlerPlayer()
 	local c=e:GetHandler()
 	Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(33331557,1))
 	local sg=Duel.SelectMatchingCard(tp,c33331557.tfilter2,tp,LOCATION_DECK,0,1,1,nil,tp)
 	local tc=sg:GetFirst()
 	local zone=aux.SequenceToGlobal(tp,LOCATION_MZONE,2)
-	if tc and Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,false) 
-		and Duel.GetLocationCount(tp,LOCATION_MZONE,tp,LOCATION_REASON_TOFIELD,zone)>0
-		and Duel.SelectYesNo(tp,aux.Stringid(33331557,2)) then
-		Duel.MoveSequence(c,2)
-		tc:SetStatus(STATUS_EFFECT_ENABLED,true)
+	if tc and Duel.MoveToField(tc,tp,tp,LOCATION_FZONE,POS_FACEUP,false) then  
+		if Duel.GetLocationCount(tp,LOCATION_MZONE,tp,LOCATION_REASON_TOFIELD,2)>0 and Duel.SelectYesNo(tp,aux.Stringid(33331557,2)) then
+			Duel.MoveSequence(c,2)
+		end
+		tc:SetStatus(STATUS_EFFECT_ENABLED,true)	
 	end
 	local e2_1=Effect.CreateEffect(c)
 	e2_1:SetType(EFFECT_TYPE_FIELD)

expansions/script/c50218128.lua

 --数码兽究极进化-羁绊
 function c50218128.initial_effect(c)
-	aux.AddRitualProcGreater2Code2(c,50218139,50218140)
+	aux.AddRitualProcEqual2Code2(c,50218139,50218140)
 	--search
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)