ndyd

expansions/script/c16101151.lua

@@ -16,17 +16,12 @@ function cm.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
 	e2:SetCode(EVENT_ADJUST)
 	e2:SetRange(0x7f)
-	e2:SetCondition(cm.con1)
 	e2:SetOperation(cm.op1)
 	c:RegisterEffect(e2)
 end
 function cm.filter1(c)
 	return c:IsType(TYPE_FUSION)
 end
-function cm.con1(e,tp)
-	local sg=Duel.GetMatchingGroup(cm.filter1,tp,0x7f,0x7f,nil)
-	return sg:GetCount()==0
-end
 function cm.op1(e,tp)
 	aux.AddFusionProcCode2=_tmp
 	aux.AddFusionProcCode2FunRep=_tmp_1
@@ -79,7 +74,7 @@ function aux.AddFusionProcCode2FunRep(c,code1,code2,f,min,max,sub,insf)
 		_G["c"..code].__index=_G["c"..code]
 	end
 	local ccodem=_G["c"..code]
-	ccodem.fst=min
+	ccodem.fst=min+2
 	return _tmp_1(c,code1,code2,f,min,max,sub,insf)
 end
 function aux.AddFusionProcCode3(c,code1,code2,code3,sub,insf)
@@ -159,7 +154,7 @@ function aux.AddFusionProcFunFun(c,f1,f2,cc,sub,insf)
 		_G["c"..code].__index=_G["c"..code]
 	end
 	local ccodem=_G["c"..code]
-	ccodem.fst=cc
+	ccodem.fst=cc+1
 	return _tmp_9(c,f1,f2,cc,sub,insf)
 end
 function aux.AddFusionProcFunFunRep(c,f1,f2,min,max,sub,insf)
@@ -169,7 +164,7 @@ function aux.AddFusionProcFunFunRep(c,f1,f2,min,max,sub,insf)
 		_G["c"..code].__index=_G["c"..code]
 	end
 	local ccodem=_G["c"..code]
-	ccodem.fst=min
+	ccodem.fst=min+1
 	return _tmp_0(c,f1,f2,min,max,sub,insf)
 end
 function aux.AddFusionProcFunRep2(c,f,min,max,insf)

expansions/script/c22100113.lua

@@ -14,9 +14,13 @@ function cm.initial_effect(c)
 	e2:SetRange(LOCATION_FZONE)
 	e2:SetCode(EFFECT_CANNOT_RELEASE)
 	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
-	e2:SetTargetRange(1,1)
-	e2:SetValue(cm.tg)
+	e2:SetTargetRange(0,1)
+	e2:SetValue(cm.tg0)
 	c:RegisterEffect(e2)
+	local e11=e2:Clone()
+	e11:SetTargetRange(1,0)
+	e11:SetValue(cm.tg1)
+	c:RegisterEffect(e11)
 --
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(m,0))
@@ -41,8 +45,11 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e4)
 --
 end
-function cm.tg(e,c,tp,sumtp)
-	return c:IsSetCard(0x8fa) and c:GetOwner()~=tp
+function cm.tg0(e,c,tp,sumtp)
+	return c:IsSetCard(0x8fa) and c:GetOwner()==e:GetHandlerPlayer()
+end
+function cm.tg1(e,c,tp,sumtp)
+	return c:IsSetCard(0x8fa) and c:GetOwner()~=e:GetHandlerPlayer()
 end
 
 function cm.atkfilter(e,tp,eg,ep,ev,re,r,rp)