Update c1110010.lua

expansions/script/c1110010.lua

@@ -79,28 +79,23 @@ end
 function c1110010.op3(e,tp,eg,ep,ev,re,r,rp)
     local c=e:GetHandler()
     local e3_1=Effect.CreateEffect(c)
+    e3_1:SetCategory(CATEGORY_TOHAND)
     e3_1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
     e3_1:SetDescription(1104)
-	e3_1:SetCategory(CATEGORY_TOHAND+CATEGORY_SPECIAL_SUMMON+CATEGORY_TOKEN)
     e3_1:SetCode(EVENT_PHASE+PHASE_END)
     e3_1:SetRange(LOCATION_MZONE)
     e3_1:SetCountLimit(1)
-	e3_1:SetReset(RESET_EVENT+0x1ee0000+RESET_PHASE+PHASE_END)
-	e3_1:SetCondition(aux.SpiritReturnCondition)
-	e3_1:SetTarget(c1110010.tg3_1)
+    e3_1:SetReset(RESET_EVENT+0xd6e0000+RESET_PHASE+PHASE_END)
+    e3_1:SetCondition(aux.SpiritReturnConditionForced)
+    e3_1:SetTarget(aux.SpiritReturnTargetForced)
     e3_1:SetOperation(c1110010.op3_1)
     c:RegisterEffect(e3_1)
     local e3_2=e3_1:Clone()
     e3_2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+    e3_2:SetCondition(aux.SpiritReturnConditionOptional)
+    e3_2:SetTarget(aux.SpiritReturnTargetOptional)
     c:RegisterEffect(e3_2)
 end
---
-function c1110010.tg3_1(e,tp,eg,ep,ev,re,r,rp,chk)
-	local c=e:GetHandler()
-	if chk==0 then return true end
-	Duel.SetOperationInfo(0,CATEGORY_TOHAND,c,1,0,0)
-end
---
 function c1110010.op3_1(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if not c:IsRelateToEffect(e) then return end