Commit 6bc4ec03 authored by VanillaSalt's avatar VanillaSalt

Merge pull request #861 from sidschingis/patch

Patch
parents 4f913bc2 4983d504
...@@ -70,6 +70,7 @@ function c21954587.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -70,6 +70,7 @@ function c21954587.thop(e,tp,eg,ep,ev,re,r,rp)
end end
function c21954587.atkcon(e,tp,eg,ep,ev,re,r,rp) function c21954587.atkcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetTurnCount()~=1 and Duel.GetCurrentPhase()==PHASE_MAIN1 return Duel.GetTurnCount()~=1 and Duel.GetCurrentPhase()==PHASE_MAIN1
and not Duel.IsPlayerAffectedByEffect(tp,EFFECT_CANNOT_BP)
end end
function c21954587.rfilter(c) function c21954587.rfilter(c)
return c:IsPosition(POS_FACEUP_ATTACK) and c:IsAttribute(ATTRIBUTE_WATER) return c:IsPosition(POS_FACEUP_ATTACK) and c:IsAttribute(ATTRIBUTE_WATER)
......
...@@ -69,7 +69,7 @@ function c22110647.descost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -69,7 +69,7 @@ function c22110647.descost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.Release(g,REASON_COST) Duel.Release(g,REASON_COST)
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_OATH)
e1:SetCode(EFFECT_CANNOT_ATTACK) e1:SetCode(EFFECT_CANNOT_ATTACK)
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END) e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
e:GetHandler():RegisterEffect(e1) e:GetHandler():RegisterEffect(e1)
......
...@@ -31,4 +31,5 @@ function c66661678.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -31,4 +31,5 @@ function c66661678.operation(e,tp,eg,ep,ev,re,r,rp)
e1:SetValue(1) e1:SetValue(1)
e1:SetReset(RESET_EVENT+0x1fe0000) e1:SetReset(RESET_EVENT+0x1fe0000)
token:RegisterEffect(e1,true) token:RegisterEffect(e1,true)
Duel.SpecialSummonComplete()
end end
...@@ -46,7 +46,7 @@ end ...@@ -46,7 +46,7 @@ end
function c93016201.cost1(e,tp,eg,ep,ev,re,r,rp,chk) function c93016201.cost1(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true end
e:SetLabel(0) e:SetLabel(0)
if not Duel.PayLPCost(tp,800) then return end if not Duel.CheckLPCost(tp,800) then return end
local ct=Duel.GetCurrentChain() local ct=Duel.GetCurrentChain()
if ct==1 then return end if ct==1 then return end
local pe=Duel.GetChainInfo(ct-1,CHAININFO_TRIGGERING_EFFECT) local pe=Duel.GetChainInfo(ct-1,CHAININFO_TRIGGERING_EFFECT)
......
...@@ -46,7 +46,7 @@ function c9596126.rmcost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -46,7 +46,7 @@ function c9596126.rmcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():GetAttackAnnouncedCount()==0 end if chk==0 then return e:GetHandler():GetAttackAnnouncedCount()==0 end
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_OATH)
e1:SetCode(EFFECT_CANNOT_ATTACK) e1:SetCode(EFFECT_CANNOT_ATTACK)
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END) e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
e:GetHandler():RegisterEffect(e1,true) e:GetHandler():RegisterEffect(e1,true)
......
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