Update c1110011.lua

expansions/script/c1110011.lua

@@ -67,30 +67,38 @@ function c1110011.op2(e,tp,eg,ep,ev,re,r,rp)
 end
 --
 function c1110011.op3(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local e3_1=Effect.CreateEffect(c)
-	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(c1110011.tg3_1)
-	e3_1:SetOperation(c1110011.op3_1)
-	c:RegisterEffect(e3_1)
-	local e3_2=e3_1:Clone()
-	e3_2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	c:RegisterEffect(e3_2)
+    local c=e:GetHandler()
+    local e3_1=Effect.CreateEffect(c)
+    e3_1:SetCategory(CATEGORY_TOHAND+CATEGORY_TOKEN+CATEGORY_SPECIAL_SUMMON)
+    e3_1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
+    e3_1:SetDescription(1104)
+    e3_1:SetCode(EVENT_PHASE+PHASE_END)
+    e3_1:SetRange(LOCATION_MZONE)
+    e3_1:SetCountLimit(1)
+    e3_1:SetReset(RESET_EVENT+0xd6e0000+RESET_PHASE+PHASE_END)
+    e3_1:SetCondition(aux.SpiritReturnConditionForced)
+    e3_1:SetTarget(c1110011.tg3_1)
+    e3_1:SetOperation(c1110011.op3_1)
+    c:RegisterEffect(e3_1)
+    local e3_2=e3_1:Clone()
+    e3_2:SetCondition(aux.SpiritReturnConditionOptional)
+    e3_2:SetTarget(c1110011.tg3_2)
+    e3_2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+    c:RegisterEffect(e3_2)
 end
---
 function c1110011.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)
+    if chk==0 then return true end
+    Duel.SetOperationInfo(0,CATEGORY_TOHAND,e:GetHandler(),1,0,0)
+    Duel.SetOperationInfo(0,CATEGORY_TOKEN,nil,1,0,0)
+    Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,0)
+end
+function  c1110011.tg3_2(e,tp,eg,ep,ev,re,r,rp,chk)
+    if chk==0 then return e:GetHandler():IsAbleToHand()
+        and Duel.IsPlayerCanSpecialSummonMonster(tp,1110197,0,0x4011,0,4800,3,RACE_PSYCHO,ATTRIBUTE_WATER) end
+    Duel.SetOperationInfo(0,CATEGORY_TOHAND,e:GetHandler(),1,0,0)
+    Duel.SetOperationInfo(0,CATEGORY_TOKEN,nil,1,0,0)
+    Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,0)
 end
---
 function c1110011.op3_1(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if not c:IsRelateToEffect(e) then return end