Relinquished

c63519819.lua

@@ -46,16 +46,6 @@ function c63519819.initial_effect(c)
 	e5:SetValue(c63519819.defval)
 	e5:SetLabelObject(e1)
 	c:RegisterEffect(e5)
-	--substitute
-	local e6=Effect.CreateEffect(c)
-	e6:SetType(EFFECT_TYPE_SINGLE)
-	e6:SetCode(EFFECT_DESTROY_SUBSTITUTE)
-	e6:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
-	e6:SetRange(LOCATION_MZONE)
-	e6:SetCondition(c63519819.adcon)
-	e6:SetValue(c63519819.repval)
-	e6:SetLabelObject(e1)
-	c:RegisterEffect(e6)
 end
 function c63519819.eqcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -89,6 +79,14 @@ function c63519819.eqop(e,tp,eg,ep,ev,re,r,rp)
 			e1:SetReset(RESET_EVENT+0x1fe0000)
 			e1:SetValue(c63519819.eqlimit)
 			tc:RegisterEffect(e1)
+			--substitute
+			local e2=Effect.CreateEffect(c)
+ 			e2:SetType(EFFECT_TYPE_EQUIP)
+ 			e2:SetCode(EFFECT_DESTROY_SUBSTITUTE)
+ 			e2:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
+ 			e2:SetReset(RESET_EVENT+0x1fe0000)
+ 			e2:SetValue(c63519819.repval)
+ 			tc:RegisterEffect(e2)
 		else Duel.SendtoGrave(tc,REASON_EFFECT) end
 	end
 end

c64631466.lua

@@ -32,26 +32,16 @@ function c64631466.initial_effect(c)
 	e3:SetValue(c64631466.defval)
 	e3:SetLabelObject(e1)
 	c:RegisterEffect(e3)
-	--substitute
+	--damage
 	local e4=Effect.CreateEffect(c)
-	e4:SetType(EFFECT_TYPE_SINGLE)
-	e4:SetCode(EFFECT_DESTROY_SUBSTITUTE)
-	e4:SetProperty(EFFECT_FLAG_SINGLE_RANGE)
+	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+	e4:SetProperty(EFFECT_FLAG_AVAILABLE_BD)
+	e4:SetCode(EVENT_DAMAGE)
 	e4:SetRange(LOCATION_MZONE)
-	e4:SetCondition(c64631466.adcon)
-	e4:SetValue(c64631466.repval)
+	e4:SetCondition(c64631466.damcon)
+	e4:SetOperation(c64631466.damop)
 	e4:SetLabelObject(e1)
 	c:RegisterEffect(e4)
-	--damage
-	local e5=Effect.CreateEffect(c)
-	e5:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
-	e5:SetProperty(EFFECT_FLAG_AVAILABLE_BD)
-	e5:SetCode(EVENT_DAMAGE)
-	e5:SetRange(LOCATION_MZONE)
-	e5:SetCondition(c64631466.damcon)
-	e5:SetOperation(c64631466.damop)
-	e5:SetLabelObject(e1)
-	c:RegisterEffect(e5)
 end
 function c64631466.eqcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -85,6 +75,14 @@ function c64631466.eqop(e,tp,eg,ep,ev,re,r,rp)
 			e1:SetReset(RESET_EVENT+0x1fe0000)
 			e1:SetValue(c64631466.eqlimit)
 			tc:RegisterEffect(e1)
+			--substitute
+			local e2=Effect.CreateEffect(c)
+ 			e2:SetType(EFFECT_TYPE_EQUIP)
+ 			e2:SetCode(EFFECT_DESTROY_SUBSTITUTE)
+ 			e2:SetProperty(EFFECT_FLAG_SET_AVAILABLE)
+ 			e2:SetReset(RESET_EVENT+0x1fe0000)
+ 			e2:SetValue(c64631466.repval)
+ 			tc:RegisterEffect(e2)
 		else Duel.SendtoGrave(tc,REASON_EFFECT) end
 	end
 end