Commit e2bf62e3 authored by VanillaSalt's avatar VanillaSalt

fix

parent 9972c865
...@@ -25,8 +25,6 @@ function c30314994.atkcon(e) ...@@ -25,8 +25,6 @@ function c30314994.atkcon(e)
return Duel.IsExistingMatchingCard(c30314994.filter,0,LOCATION_MZONE,LOCATION_MZONE,1,nil,ATTRIBUTE_FIRE) return Duel.IsExistingMatchingCard(c30314994.filter,0,LOCATION_MZONE,LOCATION_MZONE,1,nil,ATTRIBUTE_FIRE)
end end
function c30314994.atcon(e,tp,eg,ep,ev,re,r,rp) function c30314994.atcon(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
local bc=c:GetBattleTarget()
return aux.bdocon(e,tp,eg,ep,ev,re,r,rp) and e:GetHandler():IsChainAttackable() return aux.bdocon(e,tp,eg,ep,ev,re,r,rp) and e:GetHandler():IsChainAttackable()
and Duel.IsExistingMatchingCard(c30314994.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,ATTRIBUTE_WIND) and Duel.IsExistingMatchingCard(c30314994.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,ATTRIBUTE_WIND)
end end
......
...@@ -7,6 +7,7 @@ function c37780349.initial_effect(c) ...@@ -7,6 +7,7 @@ function c37780349.initial_effect(c)
e1:SetType(EFFECT_TYPE_QUICK_O) e1:SetType(EFFECT_TYPE_QUICK_O)
e1:SetCode(EVENT_PRE_DAMAGE_CALCULATE) e1:SetCode(EVENT_PRE_DAMAGE_CALCULATE)
e1:SetRange(LOCATION_HAND) e1:SetRange(LOCATION_HAND)
e1:SetCondition(c37780349.dmcon)
e1:SetCost(c37780349.dmcost) e1:SetCost(c37780349.dmcost)
e1:SetTarget(c37780349.dmtg) e1:SetTarget(c37780349.dmtg)
e1:SetOperation(c37780349.dmop) e1:SetOperation(c37780349.dmop)
...@@ -23,6 +24,9 @@ function c37780349.initial_effect(c) ...@@ -23,6 +24,9 @@ function c37780349.initial_effect(c)
e2:SetOperation(c37780349.atkop) e2:SetOperation(c37780349.atkop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function c37780349.dmcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetBattleDamage(tp)>0
end
function c37780349.dmcost(e,tp,eg,ep,ev,re,r,rp,chk) function c37780349.dmcost(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
Duel.SendtoGrave(e:GetHandler(),REASON_COST+REASON_DISCARD) Duel.SendtoGrave(e:GetHandler(),REASON_COST+REASON_DISCARD)
......
...@@ -5,7 +5,6 @@ function c44877690.initial_effect(c) ...@@ -5,7 +5,6 @@ function c44877690.initial_effect(c)
e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE) e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_SPSUMMON_CONDITION) e1:SetCode(EFFECT_SPSUMMON_CONDITION)
e1:SetValue(aux.FALSE)
c:RegisterEffect(e1) c:RegisterEffect(e1)
--summon,flip --summon,flip
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
...@@ -62,12 +61,6 @@ function c44877690.rettg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -62,12 +61,6 @@ function c44877690.rettg(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetOperationInfo(0,CATEGORY_TOHAND,e:GetHandler(),1,0,0) Duel.SetOperationInfo(0,CATEGORY_TOHAND,e:GetHandler(),1,0,0)
e:GetHandler():RegisterFlagEffect(44877690,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1) e:GetHandler():RegisterFlagEffect(44877690,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
end end
function c44877690.retop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
if c:IsRelateToEffect(e) and c:IsFaceup() then
Duel.SendtoHand(c,nil,REASON_EFFECT)
end
end
function c44877690.retcon2(e,tp,eg,ep,ev,re,r,rp) function c44877690.retcon2(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(c44877690.cfilter,tp,LOCATION_MZONE,0,1,e:GetHandler()) return Duel.IsExistingMatchingCard(c44877690.cfilter,tp,LOCATION_MZONE,0,1,e:GetHandler())
end end
......
...@@ -15,7 +15,7 @@ function c47457347.filter(c,e,tp) ...@@ -15,7 +15,7 @@ function c47457347.filter(c,e,tp)
return c:IsFaceup() and c:IsSetCard(0xf4) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) return c:IsFaceup() and c:IsSetCard(0xf4) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end end
function c47457347.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c47457347.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_REMOVED) and chkc:IsControler(tp) and c47457347.filter(chkc) end if chkc then return chkc:IsLocation(LOCATION_REMOVED) and chkc:IsControler(tp) and c47457347.filter(chkc,e,tp) end
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
and Duel.IsExistingTarget(c47457347.filter,tp,LOCATION_REMOVED,0,1,nil,e,tp) end and Duel.IsExistingTarget(c47457347.filter,tp,LOCATION_REMOVED,0,1,nil,e,tp) end
local ft=Duel.GetLocationCount(tp,LOCATION_MZONE) local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
......
...@@ -46,7 +46,6 @@ end ...@@ -46,7 +46,6 @@ end
function c47679935.efilter(e,ct) function c47679935.efilter(e,ct)
local p=e:GetHandlerPlayer() local p=e:GetHandlerPlayer()
local te,tp=Duel.GetChainInfo(ct,CHAININFO_TRIGGERING_EFFECT,CHAININFO_TRIGGERING_PLAYER) local te,tp=Duel.GetChainInfo(ct,CHAININFO_TRIGGERING_EFFECT,CHAININFO_TRIGGERING_PLAYER)
local tc=te:GetHandler()
return p==tp and te:IsHasCategory(CATEGORY_FUSION_SUMMON) return p==tp and te:IsHasCategory(CATEGORY_FUSION_SUMMON)
end end
function c47679935.limfilter(c,tp) function c47679935.limfilter(c,tp)
......
...@@ -6,7 +6,7 @@ function c67820935.initial_effect(c) ...@@ -6,7 +6,7 @@ function c67820935.initial_effect(c)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP) e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetCountLimit(1,67820935+EFFECT_COUNT_CODE_OATH) e1:SetHintTiming(TIMING_DAMAGE_STEP)
e1:SetCondition(c67820935.condition) e1:SetCondition(c67820935.condition)
e1:SetTarget(c67820935.target) e1:SetTarget(c67820935.target)
e1:SetOperation(c67820935.activate) e1:SetOperation(c67820935.activate)
......
...@@ -113,9 +113,6 @@ function c73360025.spop(e,tp,eg,ep,ev,re,r,rp) ...@@ -113,9 +113,6 @@ function c73360025.spop(e,tp,eg,ep,ev,re,r,rp)
tc:CompleteProcedure() tc:CompleteProcedure()
end end
end end
function c73360025.ctfilter(c)
return c:IsType(TYPE_MONSTER) and c:IsSetCard(0xaf)
end
function c73360025.damcon(e,tp,eg,ep,ev,re,r,rp) function c73360025.damcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetTurnPlayer()==tp return Duel.GetTurnPlayer()==tp
end end
......
...@@ -62,11 +62,11 @@ end ...@@ -62,11 +62,11 @@ end
function c86120751.thfilter(c) function c86120751.thfilter(c)
return c:IsCode(74063034) and c:IsAbleToHand() return c:IsCode(74063034) and c:IsAbleToHand()
end end
function c86120751.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c86120751.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(c86120751.thfilter,tp,LOCATION_DECK,0,1,nil) end if chk==0 then return Duel.IsExistingMatchingCard(c86120751.thfilter,tp,LOCATION_DECK,0,1,nil) end
Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK) Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
end end
function c86120751.thop(e,tp,eg,ep,ev,re,r,rp,chk) function c86120751.thop(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstMatchingCard(c86120751.thfilter,tp,LOCATION_DECK,0,nil) local tc=Duel.GetFirstMatchingCard(c86120751.thfilter,tp,LOCATION_DECK,0,nil)
if tc then if tc then
Duel.SendtoHand(tc,nil,REASON_EFFECT) Duel.SendtoHand(tc,nil,REASON_EFFECT)
......
...@@ -59,8 +59,11 @@ end ...@@ -59,8 +59,11 @@ end
function c95943058.spcon(e,tp,eg,ep,ev,re,r,rp) function c95943058.spcon(e,tp,eg,ep,ev,re,r,rp)
if Duel.GetTurnPlayer()~=tp then return end if Duel.GetTurnPlayer()~=tp then return end
local ct=e:GetLabel() local ct=e:GetLabel()
e:SetLabel(ct+1) if ct==0 then
return ct==1 e:SetLabel(Duel.GetTurnCount())
return false
end
return ct~=Duel.GetTurnCount()
end end
function c95943058.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function c95943058.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true 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