Commit 73126474 authored by VanillaSalt's avatar VanillaSalt

fix

parent 259b0524
...@@ -122,5 +122,6 @@ function c10960419.retcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -122,5 +122,6 @@ function c10960419.retcon(e,tp,eg,ep,ev,re,r,rp)
return false return false
end end
function c10960419.retop(e,tp,eg,ep,ev,re,r,rp) function c10960419.retop(e,tp,eg,ep,ev,re,r,rp)
local tc=e:GetLabelObject()
Duel.ReturnToField(tc) Duel.ReturnToField(tc)
end end
...@@ -42,5 +42,5 @@ end ...@@ -42,5 +42,5 @@ end
function c37744402.ctcon(e) function c37744402.ctcon(e)
local c=e:GetOwner() local c=e:GetOwner()
local h=e:GetHandler() local h=e:GetHandler()
return h:IsAttribute(ATTRIBUTE_FIRE) and c:IsHasCardTarget(h) return h:IsAttribute(ATTRIBUTE_WIND) and c:IsHasCardTarget(h)
end end
...@@ -42,5 +42,5 @@ end ...@@ -42,5 +42,5 @@ end
function c37970940.ctcon(e) function c37970940.ctcon(e)
local c=e:GetOwner() local c=e:GetOwner()
local h=e:GetHandler() local h=e:GetHandler()
return h:IsAttribute(ATTRIBUTE_FIRE) and c:IsHasCardTarget(h) return h:IsAttribute(ATTRIBUTE_EARTH) and c:IsHasCardTarget(h)
end end
...@@ -42,18 +42,19 @@ function c51194046.initial_effect(c) ...@@ -42,18 +42,19 @@ function c51194046.initial_effect(c)
local ge2=ge1:Clone() local ge2=ge1:Clone()
ge2:SetCode(EVENT_MSET) ge2:SetCode(EVENT_MSET)
Duel.RegisterEffect(ge2,0) Duel.RegisterEffect(ge2,0)
local ge2=Effect.CreateEffect(c)
ge2:SetType(EFFECT_TYPE_FIELD)
ge2:SetCode(EFFECT_MATERIAL_CHECK)
ge2:SetTargetRange(LOCATION_HAND,LOCATION_HAND)
ge2:SetValue(c51194046.valcheck)
ge2:SetLabelObject(ge1)
Duel.RegisterEffect(ge2,0)
local ge3=Effect.CreateEffect(c) local ge3=Effect.CreateEffect(c)
ge3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) ge3:SetType(EFFECT_TYPE_FIELD)
ge3:SetCode(EVENT_PHASE_START+PHASE_DRAW) ge3:SetCode(EFFECT_MATERIAL_CHECK)
ge3:SetOperation(c51194046.clearop) ge3:SetTargetRange(LOCATION_HAND,LOCATION_HAND)
ge3:SetValue(c51194046.valcheck)
Duel.RegisterEffect(ge3,0) Duel.RegisterEffect(ge3,0)
ge1:SetLabelObject(ge3)
ge2:SetLabelObject(ge3)
local ge4=Effect.CreateEffect(c)
ge4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
ge4:SetCode(EVENT_PHASE_START+PHASE_DRAW)
ge4:SetOperation(c51194046.clearop)
Duel.RegisterEffect(ge4,0)
end end
end end
function c51194046.splimcon(e) function c51194046.splimcon(e)
...@@ -66,12 +67,12 @@ function c51194046.checkop(e,tp,eg,ep,ev,re,r,rp) ...@@ -66,12 +67,12 @@ function c51194046.checkop(e,tp,eg,ep,ev,re,r,rp)
local tc=eg:GetFirst() local tc=eg:GetFirst()
if bit.band(tc:GetSummonType(),SUMMON_TYPE_ADVANCE)==SUMMON_TYPE_ADVANCE then if bit.band(tc:GetSummonType(),SUMMON_TYPE_ADVANCE)==SUMMON_TYPE_ADVANCE then
local p=tc:GetSummonPlayer() local p=tc:GetSummonPlayer()
c51194046[p]=c51194046[p]+e:GetLabel() c51194046[p]=c51194046[p]+e:GetLabelObject():GetLabel()
end end
end end
function c51194046.valcheck(e,c) function c51194046.valcheck(e,c)
local ct=c:GetMaterial():FilterCount(Card.IsSetCard,nil,0xaa) local ct=c:GetMaterial():FilterCount(Card.IsSetCard,nil,0xaa)
e:GetLabelObject():SetLabel(ct) e:SetLabel(ct)
end end
function c51194046.clearop(e,tp,eg,ep,ev,re,r,rp) function c51194046.clearop(e,tp,eg,ep,ev,re,r,rp)
c51194046[0]=0 c51194046[0]=0
......
...@@ -22,8 +22,10 @@ function c71578874.initial_effect(c) ...@@ -22,8 +22,10 @@ function c71578874.initial_effect(c)
e3:SetType(EFFECT_TYPE_QUICK_O) e3:SetType(EFFECT_TYPE_QUICK_O)
e3:SetCode(EVENT_FREE_CHAIN) e3:SetCode(EVENT_FREE_CHAIN)
e3:SetRange(LOCATION_MZONE) e3:SetRange(LOCATION_MZONE)
e3:SetProperty(EFFECT_FLAG_CARD_TARGET) e3:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
e3:SetHintTiming(TIMING_DAMAGE_STEP)
e3:SetCountLimit(1) e3:SetCountLimit(1)
e3:SetCondition(c71578874.swcon)
e3:SetTarget(c71578874.swtg) e3:SetTarget(c71578874.swtg)
e3:SetOperation(c71578874.swop) e3:SetOperation(c71578874.swop)
c:RegisterEffect(e3) c:RegisterEffect(e3)
...@@ -54,6 +56,9 @@ function c71578874.adop(e,tp,eg,ep,ev,re,r,rp) ...@@ -54,6 +56,9 @@ function c71578874.adop(e,tp,eg,ep,ev,re,r,rp)
tc:RegisterEffect(e2) tc:RegisterEffect(e2)
end end
end end
function c71578874.swcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated()
end
function c71578874.swtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c71578874.swtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsFaceup() end if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsFaceup() end
if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
......
...@@ -42,5 +42,5 @@ end ...@@ -42,5 +42,5 @@ end
function c73318863.ctcon(e) function c73318863.ctcon(e)
local c=e:GetOwner() local c=e:GetOwner()
local h=e:GetHandler() local h=e:GetHandler()
return h:IsAttribute(ATTRIBUTE_FIRE) and c:IsHasCardTarget(h) return h:IsAttribute(ATTRIBUTE_LIGHT) and c:IsHasCardTarget(h)
end end
...@@ -42,5 +42,5 @@ end ...@@ -42,5 +42,5 @@ end
function c74364659.ctcon(e) function c74364659.ctcon(e)
local c=e:GetOwner() local c=e:GetOwner()
local h=e:GetHandler() local h=e:GetHandler()
return h:IsAttribute(ATTRIBUTE_FIRE) and c:IsHasCardTarget(h) return h:IsAttribute(ATTRIBUTE_WATER) and c:IsHasCardTarget(h)
end end
...@@ -61,7 +61,7 @@ function c82044279.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -61,7 +61,7 @@ function c82044279.operation(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function c82044279.atkcon(e,tp,eg,ep,ev,re,r,rp) function c82044279.atkcon(e,tp,eg,ep,ev,re,r,rp)
return bit.band(r,REASON_EFFECT)~=0 and re and re:GetHandler()==e:GetHandler() return bit.band(r,REASON_EFFECT)~=0 and re and re:GetOwner()==e:GetHandler()
and eg:IsExists(Card.IsType,1,nil,TYPE_MONSTER) and eg:IsExists(Card.IsType,1,nil,TYPE_MONSTER)
end end
function c82044279.atkop(e,tp,eg,ep,ev,re,r,rp) function c82044279.atkop(e,tp,eg,ep,ev,re,r,rp)
......
...@@ -28,11 +28,11 @@ function c91078716.condition1(e,tp,eg,ep,ev,re,r,rp) ...@@ -28,11 +28,11 @@ function c91078716.condition1(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetCurrentChain()==0 return Duel.GetCurrentChain()==0
end end
function c91078716.filter(c) function c91078716.filter(c)
return c:IsReleasable() and not c:IsStatus(STATUS_BATTLE_DESTROYED) return c:IsRace(RACE_PLANT) and not c:IsStatus(STATUS_BATTLE_DESTROYED)
end end
function c91078716.cost(e,tp,eg,ep,ev,re,r,rp,chk) function c91078716.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.CheckReleaseGroup(tp,c91078716.filter,1,nil,RACE_PLANT) end if chk==0 then return Duel.CheckReleaseGroup(tp,c91078716.filter,1,nil) end
local g=Duel.SelectReleaseGroup(tp,c91078716.filter,1,1,nil,RACE_PLANT) local g=Duel.SelectReleaseGroup(tp,c91078716.filter,1,1,nil)
Duel.Release(g,REASON_COST) Duel.Release(g,REASON_COST)
end end
function c91078716.target1(e,tp,eg,ep,ev,re,r,rp,chk) function c91078716.target1(e,tp,eg,ep,ev,re,r,rp,chk)
......
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