Commit e833691d authored by POLYMER's avatar POLYMER

fix

parent 2973f68a
...@@ -82,9 +82,10 @@ function s.ctop(e, tp, eg, ep, ev, re, r, rp) ...@@ -82,9 +82,10 @@ function s.ctop(e, tp, eg, ep, ev, re, r, rp)
end end
end end
function s.xyzcon(e, tp, eg, ep, ev, re, r, rp) function s.xyzcon(e,tp,eg,ep,ev,re,r,rp)
local ph = Duel.GetCurrentPhase() local ph=Duel.GetCurrentPhase()
return ph == PHASE_MAIN1 or ph == PHASE_MAIN2 or (ph >= PHASE_BATTLE_START and ph <= PHASE_BATTLE_END) return ph==PHASE_MAIN1 or ph==PHASE_MAIN2
or (ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE)
end end
function s.xyztg(e, tp, eg, ep, ev, re, r, rp, chk) function s.xyztg(e, tp, eg, ep, ev, re, r, rp, chk)
......
...@@ -119,17 +119,23 @@ function s.atkop(e, tp, eg, ep, ev, re, r, rp) ...@@ -119,17 +119,23 @@ function s.atkop(e, tp, eg, ep, ev, re, r, rp)
local g = Duel.GetMatchingGroup(aux.TRUE, tp, 0, LOCATION_MZONE, nil) local g = Duel.GetMatchingGroup(aux.TRUE, tp, 0, LOCATION_MZONE, nil)
if g:GetCount() > 0 then if g:GetCount() > 0 then
Duel.Hint(HINT_SELECTMSG, tp, HINTMSG_OPPO) Duel.Hint(HINT_SELECTMSG, tp, HINTMSG_OPPO)
local tc = g:Select(tp, 1, 1, nil):GetFirst()
Duel.HintSelection(tc)
if tc:IsCanTurnSet() then local sg = g:Select(tp, 1, 1, nil)
Duel.ChangePosition(tc, POS_FACEDOWN_DEFENSE)
else
if c:CheckRemoveOverlayCard(tp, 1, REASON_EFFECT) local tc = sg:GetFirst()
and Duel.SelectYesNo(tp, aux.Stringid(id, 2)) then
c:RemoveOverlayCard(tp, 1, 1, REASON_EFFECT) if tc then
Duel.SendtoGrave(tc, REASON_EFFECT)
Duel.HintSelection(sg)
if tc:IsCanTurnSet() then
Duel.ChangePosition(tc, POS_FACEDOWN_DEFENSE)
else
if c:CheckRemoveOverlayCard(tp, 1, REASON_EFFECT)
and Duel.SelectYesNo(tp, aux.Stringid(id, 2)) then
c:RemoveOverlayCard(tp, 1, 1, REASON_EFFECT)
Duel.SendtoGrave(tc, REASON_EFFECT)
end
end end
end end
end end
......
...@@ -6,7 +6,7 @@ function s.initial_effect(c) ...@@ -6,7 +6,7 @@ function s.initial_effect(c)
local e1 = Effect.CreateEffect(c) local e1 = Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(id, 0)) e1:SetDescription(aux.Stringid(id, 0))
e1:SetCategory(CATEGORY_POSITION + CATEGORY_TOHAND + CATEGORY_SEARCH + CATEGORY_DECKDES + CATEGORY_LVLCHANGE) e1:SetCategory(CATEGORY_POSITION + CATEGORY_TOHAND + CATEGORY_SEARCH + CATEGORY_DECKDES )
e1:SetType(EFFECT_TYPE_SINGLE + EFFECT_TYPE_TRIGGER_O) e1:SetType(EFFECT_TYPE_SINGLE + EFFECT_TYPE_TRIGGER_O)
e1:SetCode(EVENT_SUMMON_SUCCESS) e1:SetCode(EVENT_SUMMON_SUCCESS)
e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetProperty(EFFECT_FLAG_DELAY)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment