fix 電脳増幅器 (#1904)

c303660.lua

@@ -17,15 +17,10 @@ function c303660.initial_effect(c)
 	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 	e2:SetValue(c303660.eqlimit)
 	c:RegisterEffect(e2)
-	--immune
+	--change effect
 	local e3=Effect.CreateEffect(c)
-	e3:SetType(EFFECT_TYPE_FIELD)
-	e3:SetCode(EFFECT_IMMUNE_EFFECT)
-	e3:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
-	e3:SetRange(LOCATION_SZONE)
-	e3:SetTargetRange(LOCATION_ONFIELD,LOCATION_ONFIELD)
-	e3:SetTarget(c303660.etarget)
-	e3:SetValue(c303660.efilter)
+	e3:SetType(EFFECT_TYPE_EQUIP)
+	e3:SetCode(303660)
 	c:RegisterEffect(e3)
 	--leave
 	local e4=Effect.CreateEffect(c)
@@ -37,6 +32,7 @@ function c303660.initial_effect(c)
 	local e5=Effect.CreateEffect(c)
 	e5:SetType(EFFECT_TYPE_SINGLE)
 	e5:SetCode(EFFECT_CANNOT_DISABLE)
+	e5:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
 	c:RegisterEffect(e5)
 end
 function c303660.eqlimit(e,c)
@@ -58,13 +54,6 @@ function c303660.operation(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Equip(tp,e:GetHandler(),tc)
 	end
 end
-function c303660.etarget(e,c)
-	local ec=e:GetHandler():GetEquipTarget()
-	return c:IsType(TYPE_TRAP) and ec and c:GetControler()==ec:GetControler()
-end
-function c303660.efilter(e,re)
-	return re:GetHandler()==e:GetHandler():GetEquipTarget()
-end
 function c303660.desop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=e:GetHandler():GetFirstCardTarget()
 	if tc and tc:IsLocation(LOCATION_MZONE) then

c77585513.lua

 --人造人間－サイコ・ショッカー
 function c77585513.initial_effect(c)
-	--cannot trigger
+	--cannot trigger, normal version
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_CANNOT_TRIGGER)
 	e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetTargetRange(LOCATION_HAND+LOCATION_SZONE,LOCATION_HAND+LOCATION_SZONE)
+	e1:SetCondition(c77585513.condition1)
 	e1:SetTarget(c77585513.distg)
 	c:RegisterEffect(e1)
 	--disable
@@ -15,6 +16,7 @@ function c77585513.initial_effect(c)
 	e2:SetCode(EFFECT_DISABLE)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetTargetRange(LOCATION_SZONE,LOCATION_SZONE)
+	e2:SetCondition(c77585513.condition1)
 	e2:SetTarget(c77585513.distg)
 	c:RegisterEffect(e2)
 	--disable effect
@@ -22,7 +24,8 @@ function c77585513.initial_effect(c)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e3:SetCode(EVENT_CHAIN_SOLVING)
 	e3:SetRange(LOCATION_MZONE)
-	e3:SetOperation(c77585513.disop)
+	e3:SetCondition(c77585513.discon1)
+	e3:SetOperation(c77585513.disop1)
 	c:RegisterEffect(e3)
 	--disable trap monster
 	local e4=Effect.CreateEffect(c)
@@ -30,15 +33,54 @@ function c77585513.initial_effect(c)
 	e4:SetCode(EFFECT_DISABLE_TRAPMONSTER)
 	e4:SetRange(LOCATION_MZONE)
 	e4:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
+	e4:SetCondition(c77585513.condition1)
 	e4:SetTarget(c77585513.distg)
 	c:RegisterEffect(e4)
+	--Amplifier version
+	local e5=e1:Clone()
+	e5:SetTargetRange(0,LOCATION_HAND+LOCATION_SZONE)
+	e5:SetCondition(c77585513.condition2)
+	c:RegisterEffect(e5)
+	--
+	local e6=e2:Clone()
+	e6:SetTargetRange(0,LOCATION_SZONE)
+	e6:SetCondition(c77585513.condition2)
+	c:RegisterEffect(e6)
+	--
+	local e7=e3:Clone()
+	e7:SetCondition(c77585513.discon2)
+	e7:SetOperation(c77585513.disop2)
+	c:RegisterEffect(e7)
+	--
+	local e8=e4:Clone()
+	e8:SetTargetRange(0,LOCATION_MZONE)
+	e8:SetCondition(c77585513.condition2)
+	c:RegisterEffect(e8)
+end
+function c77585513.condition1(e)
+	return not e:GetHandler():IsHasEffect(303660)
 end
 function c77585513.distg(e,c)
 	return c:IsType(TYPE_TRAP)
 end
-function c77585513.disop(e,tp,eg,ep,ev,re,r,rp)
+function c77585513.discon1(e,tp,eg,ep,ev,re,r,rp)
+	return not e:GetHandler():IsHasEffect(303660)
+end
+function c77585513.disop1(e,tp,eg,ep,ev,re,r,rp)
 	local tl=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_LOCATION)
 	if tl==LOCATION_SZONE and re:IsActiveType(TYPE_TRAP) then
 		Duel.NegateEffect(ev)
 	end
 end
+function c77585513.condition2(e)
+	return e:GetHandler():IsHasEffect(303660)
+end
+function c77585513.discon2(e,tp,eg,ep,ev,re,r,rp)
+	return e:GetHandler():IsHasEffect(303660)
+end
+function c77585513.disop2(e,tp,eg,ep,ev,re,r,rp)
+	local p,tl=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_PLAYER,CHAININFO_TRIGGERING_LOCATION)
+	if p==1-e:GetHandlerPlayer() and tl==LOCATION_SZONE and re:IsActiveType(TYPE_TRAP) then
+		Duel.NegateEffect(ev)
+	end
+end