ndyd

expansions/script/c16150021.lua

@@ -28,11 +28,11 @@ function cm.initial_effect(c)
 	e3:SetValue(cm.eqlimit)
 	c:RegisterEffect(e3)
 end
-function cm.filter(c)
+function cm.unfilter(c)
 	return c:IsFaceup() and c:IsCode(m)
 end
 function cm.uqfilter(c)
-	return Duel.GetMatchingGroupCount(cm.filter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil) and c:IsCode(m) and c:GetFlagEffect(m)==0
+	return Duel.IsExistingMatchingCard(cm.unfilter,0,LOCATION_ONFIELD,LOCATION_ONFIELD,2,c) and c:IsCode(m)
 end
 function cm.eqlimit(e,c)
 	return rk.check(c,"DAIOU")
@@ -95,4 +95,4 @@ end
 function cm.aclimit(e,re,tp)
 	local rc=re:GetHandler()
 	return rc:GetOriginalCode()==e:GetLabel()
-end	 
\ No newline at end of file
+end  
\ No newline at end of file

expansions/script/c16150022.lua

@@ -28,11 +28,11 @@ function cm.initial_effect(c)
 	e3:SetValue(cm.eqlimit)
 	c:RegisterEffect(e3)
 end
-function cm.filter(c)
+function cm.unfilter(c)
 	return c:IsFaceup() and c:IsCode(m)
 end
 function cm.uqfilter(c)
-	return Duel.GetMatchingGroupCount(cm.filter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil) and c:IsCode(m) and c:GetFlagEffect(m)==0
+	return Duel.IsExistingMatchingCard(cm.unfilter,0,LOCATION_ONFIELD,LOCATION_ONFIELD,2,c) and c:IsCode(m)
 end
 function cm.eqlimit(e,c)
 	return rk.check(c,"DAIOU")
@@ -114,5 +114,5 @@ end
 function cm.aclimit(e,re,tp)
 	local rc=re:GetHandler()
 	return rc:GetOriginalCode()==e:GetLabel()
-end	 
+end  
 		
\ No newline at end of file

expansions/script/c16150023.lua

@@ -28,11 +28,11 @@ function cm.initial_effect(c)
 	e3:SetValue(cm.eqlimit)
 	c:RegisterEffect(e3)
 end
-function cm.filter(c)
+function cm.unfilter(c)
 	return c:IsFaceup() and c:IsCode(m)
 end
 function cm.uqfilter(c)
-	return Duel.GetMatchingGroupCount(cm.filter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil) and c:IsCode(m) and c:GetFlagEffect(m)==0
+	return Duel.IsExistingMatchingCard(cm.unfilter,0,LOCATION_ONFIELD,LOCATION_ONFIELD,2,c) and c:IsCode(m)
 end
 function cm.eqlimit(e,c)
 	return rk.check(c,"DAIOU")
@@ -87,5 +87,5 @@ end
 function cm.aclimit(e,re,tp)
 	local rc=re:GetHandler()
 	return rc:GetOriginalCode()==e:GetLabel()
-end	 
+end  
 		
\ No newline at end of file

expansions/script/c16161000.lua

@@ -2,6 +2,7 @@
 local m=16161000
 local cm=_G["c"..m]
 function cm.initial_effect(c)
+	aux.EnablePendulumAttribute(c,true) 
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))
 	e1:SetType(EFFECT_TYPE_IGNITION)

expansions/script/c16161001.lua

@@ -29,7 +29,7 @@ function cm.initial_effect(c)
 	e3:SetProperty(EFFECT_FLAG_DELAY)
 	e3:SetCountLimit(1)
 	e3:SetCost(cm.cost)
-	e3:SetCondition(cm.condtion2)
+	e3:SetCondition(cm.condition2)
 	e3:SetTarget(cm.thtarget2)
 	e3:SetOperation(cm.thoperation2)
 	c:RegisterEffect(e3)
@@ -82,7 +82,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SendtoGrave(g,REASON_COST+REASON_DISCARD)
 end
 function cm.gfilter(c,tp)
-	return c:IsSummonPlayer(tp) and (c:IsType(TYPE_TOKEN) or aux.IsCodeListed(m-1))
+	return c:IsSummonPlayer(tp) and (c:IsType(TYPE_TOKEN) or aux.IsCodeListed(c,m-1))
 end
 function cm.condition2(e,tp,eg)
 	return eg:IsExists(cm.gfilter,1,nil,tp)

expansions/script/c19500039.lua

@@ -6,7 +6,6 @@ function c19500039.initial_effect(c)
 	e1:SetCode(EFFECT_SPSUMMON_PROC)
 	e1:SetProperty(EFFECT_FLAG_UNCOPYABLE)
 	e1:SetRange(LOCATION_DECK)
-	e1:SetCountLimit(1,19500039)
 	e1:SetCondition(c19500039.spcon)
 	c:RegisterEffect(e1)
 	--fusion summon
@@ -35,7 +34,7 @@ function c19500039.initial_effect(c)
 	end
 end
 function c19500039.cfilter(c)
-	return c:IsSetCard(0x3990) and c:IsPreviousLocation(LOCATION_HAND+LOCATION_ONFIELD)
+	return c:IsSetCard(0x3190) and c:IsPreviousLocation(LOCATION_HAND+LOCATION_ONFIELD)
 end
 function c19500039.acop(e,tp,eg,ep,ev,re,r,rp)
 	local ct=eg:FilterCount(c19500039.cfilter,nil)
@@ -49,13 +48,13 @@ end
 function c19500039.spcon(e,c)
 	if c==nil then return true end
 	local tp=c:GetControler()
-	return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and c19500039[0]>6
+	return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and c19500039[0]>2
 end
 function c19500039.fselect(g)
 	return g:GetClassCount(Card.GetOriginalCode)==g:GetCount()
 end
 function c19500039.costfilter(c,code)
-	return c:IsType(TYPE_MONSTER) and c:IsSetCard(0x3990) and c:IsRace(RACE_MACHINE) and c:IsAbleToRemoveAsCost() and not c:IsCode(code)
+	return c:IsType(TYPE_MONSTER) and c:IsSetCard(0x3190) and c:IsRace(RACE_MACHINE) and c:IsAbleToRemoveAsCost() and not c:IsCode(code)
 end
 function c19500039.sccost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
@@ -71,10 +70,9 @@ function c19500039.filter(c,e,tp)
 	return c:IsCode(19500038) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_SYNCHRO,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
 end
 function c19500039.sctg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetFlagEffect(tp,19500039)==0 and aux.MustMaterialCheck(nil,tp,EFFECT_MUST_BE_SMATERIAL)
+	if chk==0 then return aux.MustMaterialCheck(nil,tp,EFFECT_MUST_BE_SMATERIAL)
 		and Duel.IsExistingMatchingCard(c19500039.filter,tp,LOCATION_EXTRA,0,1,nil,e,tp) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
-	Duel.RegisterFlagEffect(tp,19500039,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
 end
 function c19500039.scop(e,tp,eg,ep,ev,re,r,rp)
 	if not aux.MustMaterialCheck(nil,tp,EFFECT_MUST_BE_SMATERIAL) then return end

expansions/script/c45745908.lua

@@ -28,7 +28,7 @@ function c45745908.initial_effect(c)
 end
 --e1
 function c45745908.filter1(c,e,tp)
-	return c:IsCode(45745908) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsCode(45745907) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c45745908.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0

expansions/script/c45745924.lua

@@ -5,7 +5,7 @@ function c45745924.initial_effect(c)
 	e1:SetCategory(CATEGORY_NEGATE+CATEGORY_DESTROY)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_CHAINING)
-	e1:SetCountLimit(1,45745924+EFFECT_COUNT_CODE_OATH)
+	e1:SetCountLimit(1,45745924)
 	e1:SetCondition(c45745924.condition)
 	e1:SetCost(c45745924.cost)
 	e1:SetTarget(c45745924.target)
@@ -19,7 +19,7 @@ function c45745924.initial_effect(c)
 	c:RegisterEffect(e2)   
 
 	local e3=Effect.CreateEffect(c)
-	e3:SetDescription(aux.Stringid(45745924,2))
+	e3:SetDescription(aux.Stringid(45745924,1))
 	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetRange(LOCATION_GRAVE)
@@ -137,9 +137,9 @@ function c45745924.activate1(e,tp,eg,ep,ev,re,r,rp)
 	e0:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
 	e0:SetReset(RESET_PHASE+PHASE_END)
 	e0:SetTargetRange(1,0)
-	e0:SetTarget(c45745924.splimit)
+	e0:SetTarget(c45745924.splimit1)
 	Duel.RegisterEffect(e0,tp)
 end
-function c45745924.splimit(e,c)
+function c45745924.splimit1(e,c)
 	return not c:IsRace(RACE_WINDBEAST)
 end
\ No newline at end of file

expansions/script/c86580023.lua

@@ -77,22 +77,24 @@ function cm.initial_effect(c)
 	e8:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
 	c:RegisterEffect(e8)
 	local e9=Effect.CreateEffect(c)
-	e9:SetDescription(aux.Stringid(m,7))
 	e9:SetCategory(CATEGORY_REMOVE)
 	e9:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e9:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e9:SetProperty(EFFECT_FLAG_DELAY)
 	e9:SetCountLimit(1,m)
-	e9:SetCondition(function(e,tp,eg,ep,ev,re,r,rp)
-		return e:GetHandler():IsSummonType(SUMMON_TYPE_FUSION)
-	end)
 	e9:SetTarget(function(e,tp,eg,ep,ev,re,r,rp,chk)
-		if chk==0 then return Duel.IsExistingMatchingCard(Card.IsType,tp,0,LOCATION_ONFIELD+LOCATION_GRAVE,1,nil,TYPE_SPELL+TYPE_TRAP) end
-		local g=Duel.GetMatchingGroup(Card.IsType,tp,0,LOCATION_ONFIELD+LOCATION_GRAVE,nil,TYPE_SPELL+TYPE_TRAP)
+		if chk==0 then return Duel.IsExistingMatchingCard(function(c)
+			return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToRemove()
+		end,tp,0,LOCATION_ONFIELD+LOCATION_GRAVE,1,nil) end
+		local g=Duel.GetMatchingGroup(function(c)
+			return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToRemove()
+		end,tp,0,LOCATION_ONFIELD+LOCATION_GRAVE,nil)
 		Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,g:GetCount(),0,0)
 	end)
 	e9:SetOperation(function(e,tp,eg,ep,ev,re,r,rp)
-		local g=Duel.GetMatchingGroup(Card.IsType,tp,0,LOCATION_ONFIELD+LOCATION_GRAVE,nil,TYPE_SPELL+TYPE_TRAP)
+		local g=Duel.GetMatchingGroup(function(c)
+			return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToRemove()
+		end,tp,0,LOCATION_ONFIELD+LOCATION_GRAVE,nil)
 		if g:GetCount()>0 then
 			Duel.Remove(g,POS_FACEDOWN,REASON_EFFECT)
 		end