Skip to content

Y
ygopro
Commit 7bc2b80f authored by VanillaSalt's avatar VanillaSalt
Browse files
Options

Merge pull request #1440 from DailyShana/patch-3 

fix Aromage
parents 20863752 cd7170aa
Hide whitespace changes
Inline Side-by-side
Showing with 11 additions and 6 deletions
script/c22174866.lua
View file @ 7bc2b80f
...@@ -18,7 +18,7 @@ function c22174866.initial_effect(c) ...@@ -18,7 +18,7 @@ function c22174866.initial_effect(c)
e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F) e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
e3:SetCode(EVENT_RECOVER) e3:SetCode(EVENT_RECOVER)
e3:SetRange(LOCATION_MZONE) e3:SetRange(LOCATION_MZONE)
e3:SetProperty(EFFECT_FLAG_CARD_TARGET) e3:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_EVENT_PLAYER)
e3:SetCountLimit(1) e3:SetCountLimit(1)
e3:SetCondition(c22174866.thcon) e3:SetCondition(c22174866.thcon)
e3:SetTarget(c22174866.thtg) e3:SetTarget(c22174866.thtg)
...@@ -37,7 +37,7 @@ function c22174866.thfilter(c) ...@@ -37,7 +37,7 @@ function c22174866.thfilter(c)
end end
function c22174866.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c22174866.thtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsOnField() and chkc:IsControler(1-tp) and c22174866.thfilter(chkc) end if chkc then return chkc:IsOnField() and chkc:IsControler(1-tp) and c22174866.thfilter(chkc) end
if chk==0 then return true end if chk==0 then return e:GetHandler():IsRelateToEffect(e) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
local g=Duel.SelectTarget(tp,c22174866.thfilter,tp,0,LOCATION_ONFIELD,1,1,nil) local g=Duel.SelectTarget(tp,c22174866.thfilter,tp,0,LOCATION_ONFIELD,1,1,nil)
Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,g:GetCount(),0,0) Duel.SetOperationInfo(0,CATEGORY_TOHAND,g,g:GetCount(),0,0)
......
script/c58569561.lua
View file @ 7bc2b80f
...@@ -14,7 +14,7 @@ function c58569561.initial_effect(c) ...@@ -14,7 +14,7 @@ function c58569561.initial_effect(c)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
e2:SetCode(EVENT_RECOVER) e2:SetCode(EVENT_RECOVER)
e2:SetRange(LOCATION_MZONE) e2:SetRange(LOCATION_MZONE)
e2:SetProperty(EFFECT_FLAG_CARD_TARGET) e2:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_EVENT_PLAYER)
e2:SetCountLimit(1) e2:SetCountLimit(1)
e2:SetCondition(c58569561.poscon) e2:SetCondition(c58569561.poscon)
e2:SetTarget(c58569561.postg) e2:SetTarget(c58569561.postg)
...@@ -50,7 +50,7 @@ function c58569561.poscon(e,tp,eg,ep,ev,re,r,rp) ...@@ -50,7 +50,7 @@ function c58569561.poscon(e,tp,eg,ep,ev,re,r,rp)
end end
function c58569561.postg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c58569561.postg(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 true end if chk==0 then return e:GetHandler():IsRelateToEffect(e) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_POSCHANGE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_POSCHANGE)
local g=Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil) local g=Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
Duel.SetOperationInfo(0,CATEGORY_POSITION,g,g:GetCount(),0,0) Duel.SetOperationInfo(0,CATEGORY_POSITION,g,g:GetCount(),0,0)
......
script/c85967160.lua
View file @ 7bc2b80f
...@@ -15,8 +15,10 @@ function c85967160.initial_effect(c) ...@@ -15,8 +15,10 @@ function c85967160.initial_effect(c)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
e2:SetCode(EVENT_RECOVER) e2:SetCode(EVENT_RECOVER)
e2:SetRange(LOCATION_MZONE) e2:SetRange(LOCATION_MZONE)
e2:SetProperty(EFFECT_FLAG_EVENT_PLAYER)
e2:SetCountLimit(1) e2:SetCountLimit(1)
e2:SetCondition(c85967160.adcon) e2:SetCondition(c85967160.adcon)
e2:SetTarget(c85967160.adtg)
e2:SetOperation(c85967160.adop) e2:SetOperation(c85967160.adop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
...@@ -27,6 +29,9 @@ end ...@@ -27,6 +29,9 @@ end
function c85967160.adcon(e,tp,eg,ep,ev,re,r,rp) function c85967160.adcon(e,tp,eg,ep,ev,re,r,rp)
return ep==tp return ep==tp
end end
function c85967160.adtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsRelateToEffect(e) end
end
function c85967160.adop(e,tp,eg,ep,ev,re,r,rp) function c85967160.adop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:IsRelateToEffect(e) and c:IsFaceup() then if c:IsRelateToEffect(e) and c:IsFaceup() then
......
script/c96789758.lua
View file @ 7bc2b80f
...@@ -15,7 +15,7 @@ function c96789758.initial_effect(c) ...@@ -15,7 +15,7 @@ function c96789758.initial_effect(c)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
e2:SetCode(EVENT_RECOVER) e2:SetCode(EVENT_RECOVER)
e2:SetRange(LOCATION_MZONE) e2:SetRange(LOCATION_MZONE)
e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_EVENT_PLAYER)
e2:SetCountLimit(1) e2:SetCountLimit(1)
e2:SetCondition(c96789758.drcon) e2:SetCondition(c96789758.drcon)
e2:SetTarget(c96789758.drtg) e2:SetTarget(c96789758.drtg)
...@@ -33,7 +33,7 @@ function c96789758.drcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -33,7 +33,7 @@ function c96789758.drcon(e,tp,eg,ep,ev,re,r,rp)
return ep==tp return ep==tp
end end
function c96789758.drtg(e,tp,eg,ep,ev,re,r,rp,chk) function c96789758.drtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return e:GetHandler():IsRelateToEffect(e) end
Duel.SetTargetPlayer(tp) Duel.SetTargetPlayer(tp)
Duel.SetTargetParam(1) Duel.SetTargetParam(1)
Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1) Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
......
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