Commit 93b38a31 authored by mercury233's avatar mercury233 Committed by DailyShana

fix (#546)

parent c5cb2b76
...@@ -14,7 +14,7 @@ function c16708652.initial_effect(c) ...@@ -14,7 +14,7 @@ function c16708652.initial_effect(c)
end end
function c16708652.condition(e,tp,eg,ep,ev,re,r,rp) function c16708652.condition(e,tp,eg,ep,ev,re,r,rp)
local ph=Duel.GetCurrentPhase() local ph=Duel.GetCurrentPhase()
return ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE and (ph~=PHASE_DAMAGE or Duel.IsDamageCalculated()) return ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE and (ph~=PHASE_DAMAGE or not Duel.IsDamageCalculated())
end end
function c16708652.filter(c) function c16708652.filter(c)
return c:IsPosition(POS_FACEUP_ATTACK) and c:IsSetCard(0x11) return c:IsPosition(POS_FACEUP_ATTACK) and c:IsSetCard(0x11)
......
...@@ -29,7 +29,7 @@ function c50903514.initial_effect(c) ...@@ -29,7 +29,7 @@ function c50903514.initial_effect(c)
end end
function c50903514.condition(e,tp,eg,ep,ev,re,r,rp) function c50903514.condition(e,tp,eg,ep,ev,re,r,rp)
local ph=Duel.GetCurrentPhase() local ph=Duel.GetCurrentPhase()
return ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE and (ph~=PHASE_DAMAGE or Duel.IsDamageCalculated()) return ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE and (ph~=PHASE_DAMAGE or not Duel.IsDamageCalculated())
end end
function c50903514.filter(c) function c50903514.filter(c)
return c:IsFaceup() and c:IsRace(RACE_WARRIOR) return c:IsFaceup() and c:IsRace(RACE_WARRIOR)
......
...@@ -17,7 +17,7 @@ function c55461064.initial_effect(c) ...@@ -17,7 +17,7 @@ function c55461064.initial_effect(c)
end end
function c55461064.atkcon(e,tp,eg,ep,ev,re,r,rp) function c55461064.atkcon(e,tp,eg,ep,ev,re,r,rp)
local ph=Duel.GetCurrentPhase() local ph=Duel.GetCurrentPhase()
return Duel.GetTurnPlayer()~=tp and ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE and (ph~=PHASE_DAMAGE or Duel.IsDamageCalculated()) return Duel.GetTurnPlayer()~=tp and ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE and (ph~=PHASE_DAMAGE or not Duel.IsDamageCalculated())
end end
function c55461064.atkcost(e,tp,eg,ep,ev,re,r,rp,chk) function c55461064.atkcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsDiscardable() end if chk==0 then return e:GetHandler():IsDiscardable() end
......
...@@ -45,7 +45,7 @@ end ...@@ -45,7 +45,7 @@ end
function c56535497.condition2(e,tp,eg,ep,ev,re,r,rp) function c56535497.condition2(e,tp,eg,ep,ev,re,r,rp)
local ph=Duel.GetCurrentPhase() local ph=Duel.GetCurrentPhase()
if Duel.GetTurnPlayer()==tp then return ph==PHASE_MAIN1 or ph==PHASE_MAIN2 if Duel.GetTurnPlayer()==tp then return ph==PHASE_MAIN1 or ph==PHASE_MAIN2
else return ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE and (ph~=PHASE_DAMAGE or Duel.IsDamageCalculated()) end else return ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE and (ph~=PHASE_DAMAGE or not Duel.IsDamageCalculated()) end
end end
function c56535497.target2(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c56535497.target2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return false end if chkc then return false end
......
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