ndyd

expansions/script/c12043081.lua

@@ -25,12 +25,12 @@ end
 function cm.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(cm.confilter,tp,LOCATION_MZONE,0,1,nil)
 end
-function cm.activate(e,tp,eg,ep,ev,re,r,rp,chk)
+function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	local g=Duel.GetMatchingGroup(Card.IsAbleToDeck,tp,0,LOCATION_ONFIELD+LOCATION_GRAVE,nil)
 	if chk==0 then return g:GetCount()>0 end
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,1,0,0)
 end
-function cm.operation(e,tp,eg,ep,ev,re,r,rp)
+function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
 	local g=Duel.SelectMatchingCard(tp,nil,tp,0,LOCATION_ONFIELD+LOCATION_GRAVE,1,1,nil)
 	if g:GetCount()>0 then

expansions/script/c12069005.lua

 --幻想之典 波恋达
 local m=12069005
 local cm=_G["c"..m]
-Duel.LoadScript("c12000000.lua")
+Duel.LoadScript("c12069000.lua")
 function cm.initial_effect(c)
 	aux.AddCodeList(c,12069000)
 	
@@ -26,14 +26,14 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp,c)
 	end
 	og:KeepAlive()
 	Duel.Draw(tp,#og,REASON_EFFECT)
-	local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_PHASE+PHASE_END)
-	e1:SetReset(RESET_PHASE+PHASE_END,1)
-	e1:SetCountLimit(1)
-	e1:SetLabelObject(og)
-	e1:SetOperation(cm.retop)
-	Duel.RegisterEffect(e1,tp)
+	local e0=Effect.CreateEffect(e:GetHandler())
+	e0:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e0:SetCode(EVENT_PHASE+PHASE_END)
+	e0:SetReset(RESET_PHASE+PHASE_END,1)
+	e0:SetCountLimit(1)
+	e0:SetLabelObject(og)
+	e0:SetOperation(cm.retop)
+	Duel.RegisterEffect(e0,tp)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_CANNOT_MSET)

expansions/script/c16104210.lua

@@ -68,13 +68,11 @@ function cm.drop(e,tp)
 		e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 		e1:SetTargetRange(1,0)
 		e1:SetTarget(aux.TargetBoolFunction(Card.IsLocation,LOCATION_DECK))
-		e1:SetReset(RESET_PHASE+PHASE_END)
 		Duel.RegisterEffect(e1,tp)
 		local e2=Effect.CreateEffect(e:GetHandler())
 		e2:SetType(EFFECT_TYPE_FIELD)
 		e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 		e2:SetCode(EFFECT_CANNOT_DRAW)
-		e2:SetReset(RESET_PHASE+PHASE_END)
 		e2:SetTargetRange(1,0)
 		Duel.RegisterEffect(e2,tp)
 		local e3=Effect.CreateEffect(e:GetHandler())

expansions/script/c16104218.lua

@@ -4,7 +4,7 @@ local m,cm=rk.set(16104218)
 function cm.initial_effect(c)
 	local e1=rsef.ACT(c,nil,nil,{1,m,1})
 	local e2=rsef.I(c,{m,0},{1},"se,th",nil,LOCATION_SZONE,nil,cm.thcost,rsop.target(cm.thfilter,"th",LOCATION_DECK),cm.thop)
-	local e3=rsef.QO(c,EVENT_FREE_CHAIN,{m,1},{1,m+1},"sum",nil,LOCATION_GRAVE,nil,aux.bfgcost,rsop.target(cm.sumfilter,"sum",LOCATION_HAND+LOCATION_PZONE),cm.sumop)
+	local e3=rsef.QO(c,EVENT_FREE_CHAIN,{m,1},{1,m},"sum",nil,LOCATION_GRAVE,nil,aux.bfgcost,rsop.target(cm.sumfilter,"sum",LOCATION_HAND+LOCATION_PZONE),cm.sumop)
 end
 function cm.rlfilter(c,tp)
 	local re=Duel.IsPlayerAffectedByEffect(tp,EFFECT_CANNOT_RELEASE)

expansions/script/c16150009.lua

@@ -51,7 +51,7 @@ end
 c16150009.pendulum_level=8
 function cm.checkop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=eg:GetFirst()
-	if tc:GetOriginalCode()==m then
+	if tc and tc:GetOriginalCode()==m then
 		local c=tc:GetEquipTarget()
 		local cid=c:CopyEffect(m,RESET_EVENT+RESETS_STANDARD,0)
 		local e3=Effect.CreateEffect(c)

expansions/script/c16150029.lua

@@ -29,7 +29,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e3) 
 end
 function cm.spcon1(e,tp,eg,ep,ev,re,r,rp)
-	return rp==tp and re:GetActivateLocation(LOCATION_HAND) and re:IsActiveType(TYPE_MONSTER)
+	return rp==tp and re:GetActivateLocation()==LOCATION_HAND and re:IsActiveType(TYPE_MONSTER)
 end
 function cm.sptg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0

expansions/script/c86580104.lua

@@ -54,7 +54,7 @@ function cm.initial_effect(c)
 		return e:GetHandler():IsType(TYPE_SPELL) and e:GetHandler():IsType(TYPE_CONTINUOUS)
 	end)
 	e3:SetTarget(function(e,c)
-		return c:IsType(TYPE_MONSTER) and c:IsSetCard(0x3653)
+		return c:IsType(TYPE_MONSTER) and c:IsSetCard(0x3653) and c:IsType(TYPE_EFFECT)
 	end)
 	e3:SetLabelObject(e2)
 	c:RegisterEffect(e3)

expansions/script/c86580119.lua

@@ -93,6 +93,9 @@ function cm.initial_effect(c)
 	end)
 	c:RegisterEffect(e5)
 end
+function cm.cf4(c)
+	return c:IsFaceup() and c:IsSetCard(0x3653)
+end
 function cm.vf4(c)
 	return not c:IsSetCard(0x3653)
 end