revert

part of 00ab9df6.

c18096222.lua

@@ -17,7 +17,7 @@ function c18096222.initial_effect(c)
 	e2:SetDescription(aux.Stringid(18096222,0))
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e2:SetCode(EVENT_TO_GRAVE)
+	e2:SetCode(EVENT_LEAVE_FIELD)
 	e2:SetCondition(c18096222.dacon)
 	e2:SetTarget(c18096222.datg)
 	e2:SetOperation(c18096222.daop)
@@ -91,8 +91,11 @@ function c18096222.eqlimit(e,c)
 end
 function c18096222.dacon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	local ec=c:GetPreviousEquipTarget()
-	return c:IsReason(REASON_DESTROY) and ec~=nil
+	local ec=c:GetEquipTarget()
+	if c:IsReason(REASON_LOST_TARGET) then
+		ec=c:GetPreviousEquipTarget()
+	end
+	return c:IsLocation(LOCATION_GRAVE) and c:IsReason(REASON_DESTROY) and ec~=nil
 end
 function c18096222.dafilter(c)
 	return c:IsFaceup() and c:IsType(TYPE_DUAL) and not c:IsDualState()

c21790410.lua

@@ -21,7 +21,7 @@ function c21790410.initial_effect(c)
 	e3:SetDescription(aux.Stringid(21790410,1))
 	e3:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e3:SetCode(EVENT_TO_GRAVE)
+	e3:SetCode(EVENT_LEAVE_FIELD)
 	e3:SetProperty(EFFECT_FLAG_DELAY)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCondition(c21790410.shcon)
@@ -59,7 +59,7 @@ function c21790410.eqlimit(e,c)
 	return e:GetOwner()==c
 end
 function c21790410.cfilter(c,ec,tp)
-	return c:IsControler(tp) and c:GetPreviousEquipTarget()==ec
+	return c:IsLocation(LOCATION_GRAVE) and c:IsControler(tp) and c:GetEquipTarget()==ec
 end
 function c21790410.shcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(c21790410.cfilter,1,nil,e:GetHandler(),tp)

c38450736.lua

@@ -26,7 +26,7 @@ function c38450736.initial_effect(c)
 	e3:SetDescription(aux.Stringid(38450736,1))
 	e3:SetCategory(CATEGORY_ATKCHANGE)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
-	e3:SetCode(EVENT_TO_GRAVE)
+	e3:SetCode(EVENT_LEAVE_FIELD)
 	e3:SetCondition(c38450736.atkcon)
 	e3:SetTarget(c38450736.atktg)
 	e3:SetOperation(c38450736.atkop)
@@ -63,7 +63,7 @@ function c38450736.eqlimit(e,c)
 end
 function c38450736.atkcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	local ec=c:GetPreviousEquipTarget()
+	local ec=c:GetEquipTarget()
 	e:SetLabelObject(ec)
 	return ec and c:IsLocation(LOCATION_GRAVE) and ec:IsFaceup() and ec:IsLocation(LOCATION_MZONE)
 end

c68184115.lua

@@ -21,7 +21,7 @@ function c68184115.initial_effect(c)
 	e3:SetDescription(aux.Stringid(68184115,1))
 	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e3:SetCode(EVENT_TO_GRAVE)
+	e3:SetCode(EVENT_LEAVE_FIELD)
 	e3:SetProperty(EFFECT_FLAG_DELAY)
 	e3:SetRange(LOCATION_MZONE)
 	e3:SetCondition(c68184115.spcon)
@@ -59,7 +59,7 @@ function c68184115.eqlimit(e,c)
 	return e:GetOwner()==c
 end
 function c68184115.cfilter(c,ec,tp)
-	return c:IsControler(tp) and c:GetPreviousEquipTarget()==ec
+	return c:IsLocation(LOCATION_GRAVE) and c:IsControler(tp) and c:GetEquipTarget()==ec
 end
 function c68184115.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(c68184115.cfilter,1,nil,e:GetHandler(),tp)