fix

expansions/script/c11451889.lua

@@ -74,10 +74,10 @@ function cm.distozone2(c,i,j,tp)
 	return math.sqrt((y-j)*(y-j)+(x-i)*(x-i))*1000
 end
 function cm.filter(c,g,i1,j1,i2,j2,tp)
-	return g:IsExists(cm.filter2,1,c,c,i1,j1,i2,j2,tp)
+	return cm.distozone2(c,i1,j1,tp)>0 and cm.distozone2(c,i2,j2,tp)>0 and g:IsExists(cm.filter2,1,c,c,i1,j1,i2,j2,tp)
 end
 function cm.filter2(c,tc,i1,j1,i2,j2,tp)
-	return cm.distozone2(c,i1,j1,tp)+cm.distozone2(c,i2,j2,tp)==cm.distozone2(tc,i1,j1,tp)+cm.distozone2(tc,i2,j2,tp)
+	return cm.distozone2(tc,i1,j1,tp)>0 and cm.distozone2(tc,i2,j2,tp)>0 and cm.distozone2(c,i1,j1,tp)+cm.distozone2(c,i2,j2,tp)==cm.distozone2(tc,i1,j1,tp)+cm.distozone2(tc,i2,j2,tp)
 end
 function cm.filter3(c,tc,i1,j1,i2,j2,tp)
 	return cm.distozone2(c,i1,j1,tp)+cm.distozone2(c,i2,j2,tp)>=cm.distozone2(tc,i1,j1,tp)+cm.distozone2(tc,i2,j2,tp)

expansions/script/c189111.lua

@@ -47,7 +47,11 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetCode(EVENT_CHAIN_SOLVING)
 	e1:SetCondition(cm.discon)
 	e1:SetOperation(cm.disop)
-	if Duel.GetTurnPlayer()==tp then e1:SetReset(RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN,2) else e1:SetReset(RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN) end
+	if Duel.GetTurnPlayer()==tp and Duel.GetCurrentPhase()==PHASE_STANDBY then
+		e1:SetReset(RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN,2)
+	else
+		e1:SetReset(RESET_PHASE+PHASE_STANDBY+RESET_SELF_TURN)
+	end
 	Duel.RegisterEffect(e1,tp)
 end
 function cm.discon(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c22348350.lua

@@ -82,7 +82,7 @@ function cm.initial_effect(c)
 	
 end
 function c22348350.cee4con(e,tp,eg,ep,ev,re,r,rp)
-	return rp==1-tp
+	return rp==1-tp and Duel.IsExistingMatchingCard(c22348350.costfilter4,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348350.costfilter4(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348362,tp) and c:IsAbleToRemoveAsCost()
@@ -103,7 +103,7 @@ function c22348350.cfilter3(c,tp)
 	return c:GetReasonPlayer()==1-tp and c:IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c22348350.cee3con(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348350.cfilter3,1,e:GetHandler(),tp)
+	return eg:IsExists(c22348350.cfilter3,1,e:GetHandler(),tp) and Duel.IsExistingMatchingCard(c22348350.costfilter3,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348350.costfilter3(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348361,tp) and c:IsAbleToRemoveAsCost()
@@ -122,7 +122,7 @@ function c22348350.cfilter(c,tp)
 	return c:IsControler(tp) and c:IsPreviousLocation(LOCATION_DECK)
 end
 function c22348350.cee2con(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348350.cfilter,1,nil,1-tp)
+	return eg:IsExists(c22348350.cfilter,1,nil,1-tp) and Duel.IsExistingMatchingCard(c22348350.costfilter2,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348350.costfilter2(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348360,tp) and c:IsAbleToRemoveAsCost()
@@ -141,7 +141,7 @@ function c22348350.thconfilter(c,sp)
 	return c:IsSummonPlayer(sp)
 end
 function c22348350.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348350.thconfilter,1,nil,1-tp)
+	return eg:IsExists(c22348350.thconfilter,1,nil,1-tp) and Duel.IsExistingMatchingCard(c22348350.costfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348350.costfilter(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348359,tp) and c:IsAbleToRemoveAsCost()

expansions/script/c22348351.lua

@@ -85,7 +85,7 @@ function cm.initial_effect(c)
 	
 end
 function c22348351.cee4con(e,tp,eg,ep,ev,re,r,rp)
-	return rp==1-tp
+	return rp==1-tp and Duel.IsExistingMatchingCard(c22348351.costfilter4,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348351.costfilter4(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348362,tp) and c:IsAbleToRemoveAsCost()
@@ -103,10 +103,10 @@ end
 
 
 function c22348351.cfilter3(c,tp)
-	return c:GetReasonPlayer()==1-tp and c:IsPreviousLocation(LOCATION_ONFIELD)
+	return c:GetReasonPlayer()==1-tp and c:IsPreviousLocation(LOCATION_ONFIELD) 
 end
 function c22348351.cee3con(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348351.cfilter3,1,e:GetHandler(),tp)
+	return eg:IsExists(c22348351.cfilter3,1,e:GetHandler(),tp) and Duel.IsExistingMatchingCard(c22348351.costfilter3,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348351.costfilter3(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348361,tp) and c:IsAbleToRemoveAsCost()
@@ -127,7 +127,7 @@ function c22348351.cfilter(c,tp)
 	return c:IsControler(tp) and c:IsPreviousLocation(LOCATION_DECK)
 end
 function c22348351.cee2con(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348351.cfilter,1,nil,1-tp)
+	return eg:IsExists(c22348351.cfilter,1,nil,1-tp) and Duel.IsExistingMatchingCard(c22348351.costfilter2,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348351.costfilter2(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348360,tp) and c:IsAbleToRemoveAsCost()
@@ -147,7 +147,7 @@ function c22348351.thconfilter(c,sp)
 	return c:IsSummonPlayer(sp)
 end
 function c22348351.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348351.thconfilter,1,nil,1-tp)
+	return eg:IsExists(c22348351.thconfilter,1,nil,1-tp) and Duel.IsExistingMatchingCard(c22348351.costfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348351.costfilter(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348359,tp) and c:IsAbleToRemoveAsCost()

expansions/script/c22348352.lua

@@ -87,7 +87,7 @@ function cm.initial_effect(c)
 	
 end
 function c22348352.cee4con(e,tp,eg,ep,ev,re,r,rp)
-	return rp==1-tp
+	return rp==1-tp and Duel.IsExistingMatchingCard(c22348352.costfilter4,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348352.costfilter4(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348362,tp) and c:IsAbleToRemoveAsCost()
@@ -108,7 +108,7 @@ function c22348352.cfilter3(c,tp)
 	return c:GetReasonPlayer()==1-tp and c:IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c22348352.cee3con(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348352.cfilter3,1,e:GetHandler(),tp)
+	return eg:IsExists(c22348352.cfilter3,1,e:GetHandler(),tp) and Duel.IsExistingMatchingCard(c22348352.costfilter3,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348352.costfilter3(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348361,tp) and c:IsAbleToRemoveAsCost()
@@ -129,7 +129,7 @@ function c22348352.cfilter(c,tp)
 	return c:IsControler(tp) and c:IsPreviousLocation(LOCATION_DECK)
 end
 function c22348352.cee2con(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348352.cfilter,1,nil,1-tp)
+	return eg:IsExists(c22348352.cfilter,1,nil,1-tp) and Duel.IsExistingMatchingCard(c22348352.costfilter2,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348352.costfilter2(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348360,tp) and c:IsAbleToRemoveAsCost()
@@ -148,8 +148,8 @@ end
 function c22348352.thconfilter(c,sp)
 	return c:IsSummonPlayer(sp)
 end
-function c22348352.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348352.thconfilter,1,nil,1-tp)
+function c22348352.thcon(e,tp,eg,ep,ev,re,r,rp) 
+	return eg:IsExists(c22348352.thconfilter,1,nil,1-tp) and Duel.IsExistingMatchingCard(c22348352.costfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348352.costfilter(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348359,tp) and c:IsAbleToRemoveAsCost()

expansions/script/c22348353.lua

@@ -88,7 +88,7 @@ function cm.initial_effect(c)
 	
 end
 function c22348353.cee4con(e,tp,eg,ep,ev,re,r,rp)
-	return rp==1-tp
+	return rp==1-tp and Duel.IsExistingMatchingCard(c22348353.costfilter4,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348353.costfilter4(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348362,tp) and c:IsAbleToRemoveAsCost()
@@ -109,7 +109,7 @@ function c22348353.cfilter3(c,tp)
 	return c:GetReasonPlayer()==1-tp and c:IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c22348353.cee3con(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348353.cfilter3,1,e:GetHandler(),tp)
+	return eg:IsExists(c22348353.cfilter3,1,e:GetHandler(),tp) and Duel.IsExistingMatchingCard(c22348353.costfilter3,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348353.costfilter3(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348361,tp) and c:IsAbleToRemoveAsCost()
@@ -128,7 +128,7 @@ function c22348353.cfilter(c,tp)
 	return c:IsControler(tp) and c:IsPreviousLocation(LOCATION_DECK)
 end
 function c22348353.cee2con(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348353.cfilter,1,nil,1-tp)
+	return eg:IsExists(c22348353.cfilter,1,nil,1-tp) and Duel.IsExistingMatchingCard(c22348353.costfilter2,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348353.costfilter2(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348360,tp) and c:IsAbleToRemoveAsCost()
@@ -148,7 +148,7 @@ function c22348353.thconfilter(c,sp)
 	return c:IsSummonPlayer(sp)
 end
 function c22348353.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348353.thconfilter,1,nil,1-tp)
+	return eg:IsExists(c22348353.thconfilter,1,nil,1-tp) and Duel.IsExistingMatchingCard(c22348353.costfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348353.costfilter(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348359,tp) and c:IsAbleToRemoveAsCost()
@@ -172,10 +172,13 @@ function c22348353.val(e,c)
 	return Duel.GetMatchingGroupCount(c22348353.atkfilter,c:GetControler(),LOCATION_MZONE,LOCATION_MZONE,nil)*200
 end
 function c22348353.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
+	local aa=nil
+	local c=e:GetHandler()
+	if c:IsType(TYPE_SPELL) then aa=c end
 	if chkc then return chkc:IsOnField() end
-	if chk==0 then return Duel.IsExistingTarget(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) end
+	if chk==0 then return Duel.IsExistingTarget(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,aa) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
-	local g=Duel.SelectTarget(tp,aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,nil)
+	local g=Duel.SelectTarget(tp,aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,aa)
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
 end
 function c22348353.desop(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c22348354.lua

@@ -87,7 +87,7 @@ function cm.initial_effect(c)
 	
 end
 function c22348354.cee4con(e,tp,eg,ep,ev,re,r,rp)
-	return rp==1-tp
+	return rp==1-tp and Duel.IsExistingMatchingCard(c22348354.costfilter4,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348354.costfilter4(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348362,tp) and c:IsAbleToRemoveAsCost()
@@ -108,7 +108,7 @@ function c22348354.cfilter3(c,tp)
 	return c:GetReasonPlayer()==1-tp and c:IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c22348354.cee3con(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348354.cfilter3,1,e:GetHandler(),tp)
+	return eg:IsExists(c22348354.cfilter3,1,e:GetHandler(),tp) and Duel.IsExistingMatchingCard(c22348354.costfilter3,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348354.costfilter3(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348361,tp) and c:IsAbleToRemoveAsCost()
@@ -127,7 +127,7 @@ function c22348354.cfilter(c,tp)
 	return c:IsControler(tp) and c:IsPreviousLocation(LOCATION_DECK)
 end
 function c22348354.cee2con(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348354.cfilter,1,nil,1-tp)
+	return eg:IsExists(c22348354.cfilter,1,nil,1-tp) and Duel.IsExistingMatchingCard(c22348354.costfilter2,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348354.costfilter2(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348360,tp) and c:IsAbleToRemoveAsCost()
@@ -147,7 +147,7 @@ function c22348354.thconfilter(c,sp)
 	return c:IsSummonPlayer(sp)
 end
 function c22348354.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348354.thconfilter,1,nil,1-tp)
+	return eg:IsExists(c22348354.thconfilter,1,nil,1-tp) and Duel.IsExistingMatchingCard(c22348354.costfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348354.costfilter(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348359,tp) and c:IsAbleToRemoveAsCost()

expansions/script/c22348355.lua

@@ -87,7 +87,7 @@ function cm.initial_effect(c)
 	
 end
 function c22348355.cee4con(e,tp,eg,ep,ev,re,r,rp)
-	return rp==1-tp
+	return rp==1-tp and Duel.IsExistingMatchingCard(c22348355.costfilter4,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348355.costfilter4(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348362,tp) and c:IsAbleToRemoveAsCost()
@@ -108,7 +108,7 @@ function c22348355.cfilter3(c,tp)
 	return c:GetReasonPlayer()==1-tp and c:IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c22348355.cee3con(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348355.cfilter3,1,e:GetHandler(),tp)
+	return eg:IsExists(c22348355.cfilter3,1,e:GetHandler(),tp) and Duel.IsExistingMatchingCard(c22348355.costfilter3,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348355.costfilter3(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348361,tp) and c:IsAbleToRemoveAsCost()
@@ -127,7 +127,7 @@ function c22348355.cfilter(c,tp)
 	return c:IsControler(tp) and c:IsPreviousLocation(LOCATION_DECK)
 end
 function c22348355.cee2con(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348355.cfilter,1,nil,1-tp)
+	return eg:IsExists(c22348355.cfilter,1,nil,1-tp) and Duel.IsExistingMatchingCard(c22348355.costfilter2,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348355.costfilter2(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348360,tp) and c:IsAbleToRemoveAsCost()
@@ -147,7 +147,7 @@ function c22348355.thconfilter(c,sp)
 	return c:IsSummonPlayer(sp)
 end
 function c22348355.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348355.thconfilter,1,nil,1-tp)
+	return eg:IsExists(c22348355.thconfilter,1,nil,1-tp) and Duel.IsExistingMatchingCard(c22348355.costfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348355.costfilter(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348359,tp) and c:IsAbleToRemoveAsCost()

expansions/script/c22348356.lua

@@ -99,12 +99,12 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e10)
 	--count
 --  if not c22348356.global_check then
---	  c22348356.global_check=true
---	  local ge1=Effect.CreateEffect(c)
---	  ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
---	  ge1:SetCode(EVENT_TO_GRAVE)
---	  ge1:SetOperation(c22348356.checkop)
---	  Duel.RegisterEffect(ge1,0) end
+--	c22348356.global_check=true
+--	local ge1=Effect.CreateEffect(c)
+--	ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+--	ge1:SetCode(EVENT_TO_GRAVE)
+--	ge1:SetOperation(c22348356.checkop)
+--	Duel.RegisterEffect(ge1,0) end
 	
 end
 function c22348356.checkop(e,tp,eg,ep,ev,re,r,rp)
@@ -114,7 +114,7 @@ function c22348356.checkop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c22348356.cee4con(e,tp,eg,ep,ev,re,r,rp)
-	return rp==1-tp
+	return rp==1-tp and Duel.IsExistingMatchingCard(c22348356.costfilter4,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348356.costfilter4(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348362,tp) and c:IsAbleToRemoveAsCost()
@@ -135,7 +135,7 @@ function c22348356.cfilter3(c,tp)
 	return c:GetReasonPlayer()==1-tp and c:IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c22348356.cee3con(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348356.cfilter3,1,e:GetHandler(),tp)
+	return eg:IsExists(c22348356.cfilter3,1,e:GetHandler(),tp) and Duel.IsExistingMatchingCard(c22348356.costfilter3,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348356.costfilter3(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348361,tp) and c:IsAbleToRemoveAsCost()
@@ -154,7 +154,7 @@ function c22348356.cfilter(c,tp)
 	return c:IsControler(tp) and c:IsPreviousLocation(LOCATION_DECK)
 end
 function c22348356.cee2con(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348356.cfilter,1,nil,1-tp)
+	return eg:IsExists(c22348356.cfilter,1,nil,1-tp) and Duel.IsExistingMatchingCard(c22348356.costfilter2,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348356.costfilter2(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348360,tp) and c:IsAbleToRemoveAsCost()
@@ -174,7 +174,7 @@ function c22348356.thconfilter(c,sp)
 	return c:IsSummonPlayer(sp)
 end
 function c22348356.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348356.thconfilter,1,nil,1-tp)
+	return eg:IsExists(c22348356.thconfilter,1,nil,1-tp) and Duel.IsExistingMatchingCard(c22348356.costfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348356.costfilter(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348359,tp) and c:IsAbleToRemoveAsCost()

expansions/script/c22348357.lua

@@ -114,7 +114,7 @@ function c22348357.scop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c22348357.cee4con(e,tp,eg,ep,ev,re,r,rp)
-	return rp==1-tp
+	return rp==1-tp and Duel.IsExistingMatchingCard(c22348357.costfilter4,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348357.costfilter4(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348362,tp) and c:IsAbleToRemoveAsCost()
@@ -135,7 +135,7 @@ function c22348357.cfilter3(c,tp)
 	return c:GetReasonPlayer()==1-tp and c:IsPreviousLocation(LOCATION_ONFIELD)
 end
 function c22348357.cee3con(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348357.cfilter3,1,e:GetHandler(),tp)
+	return eg:IsExists(c22348357.cfilter3,1,e:GetHandler(),tp) and Duel.IsExistingMatchingCard(c22348357.costfilter3,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348357.costfilter3(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348361,tp) and c:IsAbleToRemoveAsCost()
@@ -154,7 +154,7 @@ function c22348357.cfilter(c,tp)
 	return c:IsControler(tp) and c:IsPreviousLocation(LOCATION_DECK)
 end
 function c22348357.cee2con(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348357.cfilter,1,nil,1-tp)
+	return eg:IsExists(c22348357.cfilter,1,nil,1-tp) and Duel.IsExistingMatchingCard(c22348357.costfilter2,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348357.costfilter2(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348360,tp) and c:IsAbleToRemoveAsCost()
@@ -174,7 +174,7 @@ function c22348357.thconfilter(c,sp)
 	return c:IsSummonPlayer(sp)
 end
 function c22348357.thcon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(c22348357.thconfilter,1,nil,1-tp)
+	return eg:IsExists(c22348357.thconfilter,1,nil,1-tp) and Duel.IsExistingMatchingCard(c22348357.costfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp)
 end
 function c22348357.costfilter(c,e,tp)
 	return e:GetHandler():IsSetCard(0xd70a) and c:IsHasEffect(22348359,tp) and c:IsAbleToRemoveAsCost()

expansions/script/c22348358.lua

@@ -40,8 +40,12 @@ function c22348358.efftg(e,tp,eg,ep,ev,re,r,rp,chk)
 	tc:CreateEffectRelation(e)
 	e:SetLabelObject(tc)
 	local te=tc.bfg_effect
+	e:SetProperty(te:GetProperty())
 	local tg=te:GetTarget()
 	if tg then tg(e,tp,eg,ep,ev,re,r,rp,1) end
+
+
+
 end
 function c22348358.effop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=e:GetLabelObject()

expansions/script/c22348368.lua

@@ -78,6 +78,7 @@ function c22348368.effctg(e,tp,eg,ep,ev,re,r,rp,chk)
 	tc:CreateEffectRelation(e)
 	e:SetLabelObject(tc)
 	local te=tc.bfg_effect
+	e:SetProperty(te:GetProperty())
 	local tg=te:GetTarget()
 	if tg then tg(e,tp,eg,ep,ev,re,r,rp,1) end
 end
@@ -87,8 +88,8 @@ function c22348368.effcop(e,tp,eg,ep,ev,re,r,rp)
 		local te=tc.bfg_effect
 		local op=te:GetOperation()
 		if op then op(e,tp,eg,ep,ev,re,r,rp) end
---	Duel.BreakEffect()
---	Duel.DiscardHand(tp,nil,1,1,REASON_EFFECT+REASON_DISCARD,nil)
+--  Duel.BreakEffect()
+--  Duel.DiscardHand(tp,nil,1,1,REASON_EFFECT+REASON_DISCARD,nil)
 	end
 end