Skip to content

Y
ygopro-scripts
Commit 92d06db3 authored by DailyShana's avatar DailyShana
Browse files
Options

fix

parent d618bc03
Hide whitespace changes
Inline Side-by-side
Showing with 38 additions and 7 deletions
c23434538.lua
View file @ 92d06db3
...@@ -47,14 +47,14 @@ function c23434538.filter(c,sp) ...@@ -47,14 +47,14 @@ function c23434538.filter(c,sp)
return c:GetSummonPlayer()==sp return c:GetSummonPlayer()==sp
end end
function c23434538.drcon1(e,tp,eg,ep,ev,re,r,rp) function c23434538.drcon1(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(c23434538.filter,1,nil,1-tp) return eg:IsExists(c23434538.filter,1,nil,1-tp)
and (not re:IsHasType(EFFECT_TYPE_ACTIONS) or re:IsHasType(EFFECT_TYPE_CONTINUOUS)) and (not re:IsHasType(EFFECT_TYPE_ACTIONS) or re:IsHasType(EFFECT_TYPE_CONTINUOUS))
end end
function c23434538.drop1(e,tp,eg,ep,ev,re,r,rp) function c23434538.drop1(e,tp,eg,ep,ev,re,r,rp)
Duel.Draw(tp,1,REASON_EFFECT) Duel.Draw(tp,1,REASON_EFFECT)
end end
function c23434538.regcon(e,tp,eg,ep,ev,re,r,rp) function c23434538.regcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(c23434538.filter,1,nil,1-tp) return eg:IsExists(c23434538.filter,1,nil,1-tp)
and re:IsHasType(EFFECT_TYPE_ACTIONS) and not re:IsHasType(EFFECT_TYPE_CONTINUOUS) and re:IsHasType(EFFECT_TYPE_ACTIONS) and not re:IsHasType(EFFECT_TYPE_CONTINUOUS)
end end
function c23434538.regop(e,tp,eg,ep,ev,re,r,rp) function c23434538.regop(e,tp,eg,ep,ev,re,r,rp)
......
c2948263.lua
View file @ 92d06db3
...@@ -55,7 +55,7 @@ function c2948263.spop(e,tp,eg,ep,ev,re,r,rp,c) ...@@ -55,7 +55,7 @@ function c2948263.spop(e,tp,eg,ep,ev,re,r,rp,c)
if atk<0 then return end if atk<0 then return end
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetCode(EFFECT_SET_ATTACK)
e1:SetValue(atk*2) e1:SetValue(atk*2)
e1:SetReset(RESET_EVENT+0xff0000) e1:SetReset(RESET_EVENT+0xff0000)
c:RegisterEffect(e1) c:RegisterEffect(e1)
......
c35199656.lua
View file @ 92d06db3
...@@ -19,9 +19,23 @@ function c35199656.initial_effect(c) ...@@ -19,9 +19,23 @@ function c35199656.initial_effect(c)
e2:SetCode(EVENT_TO_HAND) e2:SetCode(EVENT_TO_HAND)
e2:SetProperty(EFFECT_FLAG_DELAY) e2:SetProperty(EFFECT_FLAG_DELAY)
e2:SetRange(LOCATION_MZONE) e2:SetRange(LOCATION_MZONE)
e2:SetCondition(c35199656.damcon) e2:SetCondition(c35199656.damcon1)
e2:SetOperation(c35199656.damop) e2:SetOperation(c35199656.damop1)
c:RegisterEffect(e2) c:RegisterEffect(e2)
local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
e3:SetCode(EVENT_TO_HAND)
e3:SetRange(LOCATION_MZONE)
e3:SetCondition(c35199656.regcon)
e3:SetOperation(c35199656.regop)
c:RegisterEffect(e3)
local e4=Effect.CreateEffect(c)
e4:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
e4:SetCode(EVENT_CHAIN_SOLVED)
e4:SetRange(LOCATION_MZONE)
e4:SetCondition(c35199656.damcon2)
e4:SetOperation(c35199656.damop2)
c:RegisterEffect(e4)
end end
function c35199656.cost(e,tp,eg,ep,ev,re,r,rp,chk) function c35199656.cost(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local c=e:GetHandler()
...@@ -52,11 +66,28 @@ function c35199656.operation(e,tp,eg,ep,ev,re,r,rp) ...@@ -52,11 +66,28 @@ function c35199656.operation(e,tp,eg,ep,ev,re,r,rp)
end end
end end
end end
function c35199656.damcon(e,tp,eg,ep,ev,re,r,rp) function c35199656.damcon1(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(Card.IsControler,1,nil,1-tp) return eg:IsExists(Card.IsControler,1,nil,1-tp)
and (not re or not re:IsHasType(EFFECT_TYPE_ACTIONS) or re:IsHasType(EFFECT_TYPE_CONTINUOUS))
end end
function c35199656.damop(e,tp,eg,ep,ev,re,r,rp) function c35199656.damop1(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_CARD,0,35199656) Duel.Hint(HINT_CARD,0,35199656)
local ct=eg:FilterCount(Card.IsControler,nil,1-tp) local ct=eg:FilterCount(Card.IsControler,nil,1-tp)
Duel.Damage(1-tp,ct*200,REASON_EFFECT) Duel.Damage(1-tp,ct*200,REASON_EFFECT)
end end
function c35199656.regcon(e,tp,eg,ep,ev,re,r,rp)
return eg:IsExists(Card.IsControler,1,nil,1-tp)
and re and re:IsHasType(EFFECT_TYPE_ACTIONS) and not re:IsHasType(EFFECT_TYPE_CONTINUOUS)
end
function c35199656.regop(e,tp,eg,ep,ev,re,r,rp)
e:GetHandler():RegisterFlagEffect(35199656,RESET_CHAIN,0,1)
end
function c35199656.damcon2(e,tp,eg,ep,ev,re,r,rp)
return e:GetHandler():GetFlagEffect(35199656)>0
end
function c35199656.damop2(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_CARD,0,35199656)
local ct=e:GetHandler():GetFlagEffect(35199656)
e:GetHandler():ResetFlagEffect(35199656)
Duel.Damage(1-tp,ct*200,REASON_EFFECT)
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