ndyd

deck/2021-09-05 6th.ydk

 #created by ...
 #main
-33400000
 33400127
 33401318
 33401601

expansions/script/c12017001.lua

@@ -80,4 +80,5 @@ function cm.rtg(e,tp,eg,ep,ev,re,r,rp)
 		if not g:GetFirst():IsLocation(LOCATION_HAND) and g:GetFirst():IsControler(1-tp) then
 			Duel.Draw(tp,1,REASON_EFFECT)
 		end
-	end
+	end
\ No newline at end of file
+end

expansions/script/c12017020.lua

@@ -9,7 +9,7 @@ function cm.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetCountLimit(1,m+EFFECT_COUNT_CODE_OATH)
-	e1:SetTarget(cmtarget)
+	e1:SetTarget(cm.target)
 	e1:SetOperation(cm.activate)
 	c:RegisterEffect(e1)
 

expansions/script/c12068006.lua

@@ -33,7 +33,6 @@ function cm.initial_effect(c)
 	e2:SetCode(EVENT_REMOVE)
 	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e2:SetCountLimit(1,m+100)
-	e2:SetCondition(cm.thcon)
 	e2:SetTarget(cm.thtg)
 	e2:SetOperation(cm.thop)
 	c:RegisterEffect(e2)

expansions/script/c16161001.lua

@@ -7,7 +7,7 @@ function cm.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
-	c:RegisterEffect(c)
+	c:RegisterEffect(e1)
 	--thand
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(m,0))

expansions/script/c17035340.lua

@@ -247,7 +247,7 @@ function cm.disop(e,tp,eg,ep,ev,re,r,rp)
 end
 function cm.pentg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():GetFlagEffect(17035340)>0 
-		and (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1) end
+		and (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1)) end
 end
 function cm.penop(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.CheckLocation(tp,LOCATION_PZONE,0) and not Duel.CheckLocation(tp,LOCATION_PZONE,1) then return false end

expansions/script/c33403504.lua

@@ -13,12 +13,6 @@ function cm.initial_effect(c)
 	e1:SetTarget(cm.target)
 	e1:SetOperation(cm.activate)
 	c:RegisterEffect(e1)
- --act in hand
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetCode(EFFECT_TRAP_ACT_IN_HAND)
-	e3:SetCondition(cm.handcon)
-	c:RegisterEffect(e3)
 end
 function cm.con(e,tp,eg,ep,ev,re,r,rp)
 local ss=Duel.GetTurnCount()
@@ -112,10 +106,3 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 	   end
 	end
 end
-
-function cm.filter(c)
-	return c:IsFaceup() and c:IsCode(33403500)
-end
-function cm.handcon(e)
-	return Duel.IsExistingMatchingCard(cm.filter,e:GetHandlerPlayer(),LOCATION_MZONE+LOCATION_GRAVE,0,1,nil)
-end
\ No newline at end of file

expansions/script/c33403505.lua

@@ -14,12 +14,6 @@ function cm.initial_effect(c)
 	e1:SetTarget(cm.target)
 	e1:SetOperation(cm.activate)
 	c:RegisterEffect(e1)
- --act in hand
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetCode(EFFECT_TRAP_ACT_IN_HAND)
-	e3:SetCondition(cm.handcon)
-	c:RegisterEffect(e3)
 end
 function cm.con(e,tp,eg,ep,ev,re,r,rp)
  local ss=Duel.GetTurnCount()
@@ -69,10 +63,3 @@ end
 function cm.refcon(e,re,val,r,rp,rc)
 	return bit.band(r,REASON_EFFECT)~=0
 end
-
-function cm.filter(c)
-	return c:IsFaceup() and c:IsCode(33403500)
-end
-function cm.handcon(e)
-	return Duel.IsExistingMatchingCard(cm.filter,e:GetHandlerPlayer(),LOCATION_MZONE+LOCATION_GRAVE,0,1,nil)
-end
\ No newline at end of file

expansions/script/c33403508.lua

@@ -13,12 +13,6 @@ function cm.initial_effect(c)
 	e1:SetTarget(cm.target)
 	e1:SetOperation(cm.activate)
 	c:RegisterEffect(e1)
- --act in hand
-	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_SINGLE)
-	e3:SetCode(EFFECT_TRAP_ACT_IN_HAND)
-	e3:SetCondition(cm.handcon)
-	c:RegisterEffect(e3)
 end
 function cm.con(e,tp,eg,ep,ev,re,r,rp)
  local ss=Duel.GetTurnCount()
@@ -92,10 +86,3 @@ if not Duel.IsExistingMatchingCard(Card.IsControlerCanBeChanged,tp,0,LOCATION_MZ
 			tc1:RegisterEffect(e2)
 	end
 end
-
-function cm.filter(c)
-	return c:IsFaceup() and c:IsCode(33403500)
-end
-function cm.handcon(e)
-	return Duel.IsExistingMatchingCard(cm.filter,e:GetHandlerPlayer(),LOCATION_MZONE+LOCATION_GRAVE,0,1,nil)
-end
\ No newline at end of file

expansions/script/c33501423.lua

 --完美世界-天选姬
 local m=33501423
 local cm=_G["c"..m]
-Duel.LoadScript("c33503001.lua")
+Duel.LoadScript("c35400101.lua")
 function cm.initial_effect(c)
 	c:EnableReviveLimit()
 	aux.AddLinkProcedure(c,cm.matfilter,3,6,cm.lcheck)   

expansions/script/c33503204.lua

@@ -6,7 +6,7 @@ Duel.LoadScript("c33503200.lua")
 function cm.initial_effect(c)
 	aux.AddCodeList(c,33503200)
 	--synchro summon
-	aux.AddSynchroProcedure(c,nil),aux.NonTuner(nil),1)
+	aux.AddSynchroProcedure(c,nil,aux.NonTuner(nil),1)
 	c:EnableReviveLimit()
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))

expansions/script/c35400107.lua

 --十二香华 庄佑
 local m=35400107
 local cm=_G["c"..m]
+Duel.LoadScript("c35400101.lua")
 function cm.initial_effect(c)
 	local e1=Suyu_bj_x.Bemat(c,cm.efop)
 	local e4=Effect.CreateEffect(c)

expansions/script/c4231030.lua

@@ -13,7 +13,7 @@ function cm.initial_effect(c)
 		.e("SetProperty",EFFECT_FLAG_PLAYER_TARGET)
 		.e("SetTargetRange",1,1)
 		.e("SetTarget",function(e,c,tp,sumtp,sumpos)
-			return Duel.IsExistingMatchingCard(function(c,lv) return c:IsLevel(lv) end,sumtp,LOCATION_MZONE,0,1,nil,c:GetLevel()) or (c:IsType(TYPE_SYNCHRO) and c:IsType(TYPE_MONSTER) and Duel.IsExistingMatchingCard(function(c) return :IsType(TYPE_SYNCHRO) and c:IsType(TYPE_MONSTER) end,sumtp,LOCATION_MZONE,0,1,nil)) end)
+			return Duel.IsExistingMatchingCard(function(c,lv) return c:IsLevel(lv) end,sumtp,LOCATION_MZONE,0,1,nil,c:GetLevel()) or (c:IsType(TYPE_SYNCHRO) and c:IsType(TYPE_MONSTER) and Duel.IsExistingMatchingCard(function(c) return c:IsType(TYPE_SYNCHRO) and c:IsType(TYPE_MONSTER) end,sumtp,LOCATION_MZONE,0,1,nil)) end)
 	.Return()).c("RegisterEffect",iFunc(c)
 		.e("SetType",EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F) 
 		.e("SetRange",LOCATION_FZONE)

expansions/script/c45746837.lua

@@ -138,7 +138,7 @@ function c45746837.cost3(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.PayLPCost(tp,math.floor(Duel.GetLP(tp)/2))
 end
-function c45746837.tdtg2(e,tp,eg,ep,ev,re,r,rp,chk)
+function c45746837.tdtg3(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(aux.disfilter1,tp,0,LOCATION_MZONE,1,nil) end
 	local g=Duel.GetMatchingGroup(aux.disfilter1,tp,0,LOCATION_MZONE,nil)
 	Duel.SetOperationInfo(0,CATEGORY_DISABLE,g,g:GetCount(),0,0)

expansions/script/c71402000.lua

@@ -121,7 +121,7 @@ function c71402000.efop(e,tp,eg,ep,ev,re,r,rp)
 	elseif dc==3 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 		local g=Duel.SelectMatchingCard(tp,c71402000.filter2,tp,LOCATION_DECK,0,1,1,nil)
-		if g:GetCount()>0 then Duel.SendtoGrave(g,REASON_EFFECT)>0 end
+		if g:GetCount()>0 then Duel.SendtoGrave(g,REASON_EFFECT) end
 	elseif dc==4 then
 		local thg=Duel.GetMatchingGroup(c71402000.filter3,tp,LOCATION_GRAVE,0,nil)
 		if thg:GetCount()>0

expansions/script/c81009003.lua

@@ -33,7 +33,6 @@ function cm.initial_effect(c)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1,m+2)
-	e2:SetCondition(cm.effcon)
 	e2:SetTarget(cm.efftg)
 	e2:SetOperation(cm.effop)
 	c:RegisterEffect(e2)