Commit 71a3b584 authored by POLYMER's avatar POLYMER

fix

parent 6a550c40
...@@ -28,7 +28,7 @@ function cm.initial_effect(c) ...@@ -28,7 +28,7 @@ function cm.initial_effect(c)
e3:SetCode(EVENT_CHAIN_SOLVED) e3:SetCode(EVENT_CHAIN_SOLVED)
e3:SetRange(LOCATION_GRAVE+LOCATION_DECK) e3:SetRange(LOCATION_GRAVE+LOCATION_DECK)
e3:SetProperty(EFFECT_FLAG_UNCOPYABLE) e3:SetProperty(EFFECT_FLAG_UNCOPYABLE)
e3:SetCountLimit(1,EFFECT_COUNT_CODE_CHAIN) --e3:SetCountLimit(1)
e3:SetCondition(cm.con) e3:SetCondition(cm.con)
e3:SetOperation(cm.op) e3:SetOperation(cm.op)
c:RegisterEffect(e3) c:RegisterEffect(e3)
...@@ -106,6 +106,9 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp) ...@@ -106,6 +106,9 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp)
cm[tc]=1 cm[tc]=1
cm[c]=nil cm[c]=nil
return return
else
g:RemoveCard(c)
for rc in aux.Next(g) do cm[rc]=2 end
end end
end end
if re:GetHandler():IsRelateToEffect(re) then if re:GetHandler():IsRelateToEffect(re) then
......
...@@ -37,12 +37,28 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -37,12 +37,28 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
local ag=sg:Filter(Card.IsAbleToHand,nil) local ag=sg:Filter(Card.IsAbleToHand,nil)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local sg1=ag:Select(tp,1,1,nil) local sg1=ag:Select(tp,1,1,nil)
if #sg1>0 and Duel.SendtoHand(sg1,nil,REASON_EFFECT)>0 then local tc=sg1:GetFirst()
if tc and Duel.SendtoHand(tc,nil,REASON_EFFECT)>0 and tc:IsLocation(LOCATION_HAND) then
Duel.ConfirmCards(1-tp,sg1) Duel.ConfirmCards(1-tp,sg1)
sg:Sub(sg1) sg:Sub(sg1)
if #sg>0 then if #sg>0 then
Duel.SendtoGrave(sg,REASON_EFFECT) Duel.SendtoGrave(sg,REASON_EFFECT)
end end
if e:IsHasType(EFFECT_TYPE_ACTIVATE) then
local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD)
e1:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e1:SetTargetRange(1,0)
e1:SetLabelObject(tc)
e1:SetTarget(s.splimit)
e1:SetReset(RESET_PHASE+PHASE_END)
Duel.RegisterEffect(e1,tp)
end
end end
end end
end
function s.splimit(e,c)
local tc=e:GetLabelObject()
return not (c:IsRace(tc:GetRace()) and c:IsAttribute(tc:GetAttribute())) and not c:IsLocation(LOCATION_EXTRA)
end end
\ No newline at end of file
...@@ -47,8 +47,8 @@ function c67200672.ovfilter(c) ...@@ -47,8 +47,8 @@ function c67200672.ovfilter(c)
return c:IsFaceup() and c:IsSetCard(0x667b) and c:IsType(TYPE_XYZ) and not c:IsCode(67200672) return c:IsFaceup() and c:IsSetCard(0x667b) and c:IsType(TYPE_XYZ) and not c:IsCode(67200672)
end end
function c67200672.xyzop(e,tp,chk) function c67200672.xyzop(e,tp,chk)
if chk==0 then return Duel.GetFlagEffect(tp,id)==0 end if chk==0 then return Duel.GetFlagEffect(tp,67200672)==0 end
Duel.RegisterFlagEffect(tp,id,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1) Duel.RegisterFlagEffect(tp,67200672,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
end end
function c67200672.atkval(e,c) function c67200672.atkval(e,c)
local g=e:GetHandler():GetOverlayGroup() local g=e:GetHandler():GetOverlayGroup()
......
...@@ -73,7 +73,7 @@ function c98500501.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -73,7 +73,7 @@ function c98500501.thop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c98500501.discon(e,tp,eg,ep,ev,re,r,rp) function c98500501.discon(e,tp,eg,ep,ev,re,r,rp)
return (Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2 and Duel.GetTurnPlayer()==tp) or (Duel.GetTurnPlayer()~=tp and ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE) return ((Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2) and Duel.GetTurnPlayer()==tp) or (Duel.GetTurnPlayer()~=tp and Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE)
end end
function c98500501.distg(e,tp,eg,ep,ev,re,r,rp,chk) function c98500501.distg(e,tp,eg,ep,ev,re,r,rp,chk)
local g=Duel.GetMatchingGroup(aux.NegateAnyFilter,tp,0,LOCATION_MZONE,nil) local g=Duel.GetMatchingGroup(aux.NegateAnyFilter,tp,0,LOCATION_MZONE,nil)
......
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