Skip to content

Y
ygopro-pre-data
Commit 423d0090 authored by mercury233's avatar mercury233
Browse files
Options

fix

parent 68ed7426
Hide whitespace changes
Inline Side-by-side
Showing with 39 additions and 32 deletions
script/c100281063.lua
View file @ 423d0090
...@@ -30,7 +30,7 @@ function c100281063.initial_effect(c) ...@@ -30,7 +30,7 @@ function c100281063.initial_effect(c)
e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e4:SetCode(EVENT_ATTACK_ANNOUNCE) e4:SetCode(EVENT_ATTACK_ANNOUNCE)
e4:SetRange(LOCATION_SZONE) e4:SetRange(LOCATION_SZONE)
e2:SetCountLimit(1,100281063+100) e4:SetCountLimit(1,100281063+100)
e4:SetCondition(c100281063.atkcon) e4:SetCondition(c100281063.atkcon)
e4:SetOperation(c100281063.atkop) e4:SetOperation(c100281063.atkop)
c:RegisterEffect(e4) c:RegisterEffect(e4)
......
script/c100312022.lua
View file @ 423d0090
...@@ -41,7 +41,7 @@ function c100312022.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -41,7 +41,7 @@ function c100312022.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local sc=g:Select(tp,1,1,nil) local sc=g:Select(tp,1,1,nil)
Duel.BreakEffect() Duel.BreakEffect()
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(sc,nil,REASON_EFFECT)
end end
end end
end end
script/c100417013.lua
View file @ 423d0090
...@@ -18,6 +18,7 @@ function c100417013.initial_effect(c) ...@@ -18,6 +18,7 @@ function c100417013.initial_effect(c)
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(100417013,1)) e2:SetDescription(aux.Stringid(100417013,1))
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetProperty(EFFECT_FLAG_DELAY)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_MOVE) e2:SetCode(EVENT_MOVE)
e2:SetRange(LOCATION_MZONE) e2:SetRange(LOCATION_MZONE)
...@@ -57,7 +58,7 @@ function c100417013.spcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -57,7 +58,7 @@ function c100417013.spcon(e,tp,eg,ep,ev,re,r,rp)
return rp~=tp and eg:IsExists(c100417013.filter,1,nil) return rp~=tp and eg:IsExists(c100417013.filter,1,nil)
end end
function c100417013.spfilter(c,e,tp,mc) function c100417013.spfilter(c,e,tp,mc)
return c:IsSetCard(0x696) and c:IsType(TYPE_XYZ) and mc:IsCanBeXyzMaterial(c) return c:IsSetCard(0x271) and c:IsType(TYPE_XYZ) and mc:IsCanBeXyzMaterial(c)
and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,mc,c)>0 and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_XYZ,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,mc,c)>0
end end
function c100417013.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function c100417013.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
......
script/c100417014.lua
View file @ 423d0090
...@@ -8,8 +8,8 @@ function c100417014.initial_effect(c) ...@@ -8,8 +8,8 @@ function c100417014.initial_effect(c)
e1:SetDescription(aux.Stringid(100417014,0)) e1:SetDescription(aux.Stringid(100417014,0))
e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_RECOVER) e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_RECOVER)
e1:SetType(EFFECT_TYPE_IGNITION) e1:SetType(EFFECT_TYPE_IGNITION)
e1:SetCountLimit(1,100417014)
e1:SetRange(LOCATION_MZONE) e1:SetRange(LOCATION_MZONE)
e1:SetCountLimit(1,100417014)
e1:SetTarget(c100417014.efftg) e1:SetTarget(c100417014.efftg)
e1:SetOperation(c100417014.effop) e1:SetOperation(c100417014.effop)
c:RegisterEffect(e1) c:RegisterEffect(e1)
...@@ -17,6 +17,7 @@ function c100417014.initial_effect(c) ...@@ -17,6 +17,7 @@ function c100417014.initial_effect(c)
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(100417014,1)) e2:SetDescription(aux.Stringid(100417014,1))
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetProperty(EFFECT_FLAG_DELAY)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_MOVE) e2:SetCode(EVENT_MOVE)
e2:SetRange(LOCATION_MZONE) e2:SetRange(LOCATION_MZONE)
......
script/c100417015.lua
View file @ 423d0090
--エクソシスター・ソフィア --エクソシスター・イレーヌ
-- --
--Scripted by KillerDJ --Scripted by KillerDJ
function c100417015.initial_effect(c) function c100417015.initial_effect(c)
...@@ -6,11 +6,11 @@ function c100417015.initial_effect(c) ...@@ -6,11 +6,11 @@ function c100417015.initial_effect(c)
--draw --draw
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(100417015,0)) e1:SetDescription(aux.Stringid(100417015,0))
e1:SetCategory(CATEGORY_SPECIAL_SUMMON) e1:SetCategory(CATEGORY_DRAW+CATEGORY_RECOVER)
e1:SetType(EFFECT_TYPE_IGNITION) e1:SetType(EFFECT_TYPE_IGNITION)
e1:SetRange(LOCATION_MZONE) e1:SetRange(LOCATION_MZONE)
e1:SetCountLimit(1,100417015) e1:SetCountLimit(1,100417015)
e1:SetCondition(c100417015.effcon) e1:SetCost(c100417015.effcost)
e1:SetTarget(c100417015.efftg) e1:SetTarget(c100417015.efftg)
e1:SetOperation(c100417015.effop) e1:SetOperation(c100417015.effop)
c:RegisterEffect(e1) c:RegisterEffect(e1)
...@@ -18,8 +18,9 @@ function c100417015.initial_effect(c) ...@@ -18,8 +18,9 @@ function c100417015.initial_effect(c)
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(100417015,1)) e2:SetDescription(aux.Stringid(100417015,1))
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetProperty(EFFECT_FLAG_DELAY)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_CUSTOM+101107081) e2:SetCode(EVENT_MOVE)
e2:SetRange(LOCATION_MZONE) e2:SetRange(LOCATION_MZONE)
e2:SetCountLimit(1,100417015+100) e2:SetCountLimit(1,100417015+100)
e2:SetCondition(c100417015.spcon) e2:SetCondition(c100417015.spcon)
...@@ -27,14 +28,14 @@ function c100417015.initial_effect(c) ...@@ -27,14 +28,14 @@ function c100417015.initial_effect(c)
e2:SetOperation(c100417015.spop) e2:SetOperation(c100417015.spop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function c100417015.filter(c) function c100417015.costfilter(c)
return c:IsPreviousLocation(LOCATION_GRAVE) return c:IsSetCard(0x271) and c:IsAbleToDeckAsCost()
end
function c100417015.cfilter(c)
return c:IsFaceup() and c:IsSetCard(0x271)
end end
function c100417015.effcon(e,tp,eg,ep,ev,re,r,rp,chk) function c100417015.effcost(e,tp,eg,ep,ev,re,r,rp,chk)
return Duel.IsExistingMatchingCard(c100417015.cfilter,tp,LOCATION_MZONE,0,1,e:GetHandler()) if chk==0 then return Duel.IsExistingMatchingCard(c100417015.costfilter,tp,LOCATION_HAND,0,1,nil) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
local g=Duel.SelectMatchingCard(tp,c100417015.costfilter,tp,LOCATION_HAND,0,1,1,nil)
Duel.SendtoDeck(g,nil,1,REASON_COST)
end end
function c100417015.efftg(e,tp,eg,ep,ev,re,r,rp,chk) function c100417015.efftg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end
...@@ -42,17 +43,20 @@ function c100417015.efftg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -42,17 +43,20 @@ function c100417015.efftg(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetTargetParam(1) Duel.SetTargetParam(1)
Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1) Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
end end
function c100417015.cfilter1(c) function c100417015.cfilter(c)
return c:IsFaceup() and c:IsCode(100417016) return c:IsFaceup() and c:IsCode(100417016)
end end
function c100417015.effop(e,tp,eg,ep,ev,re,r,rp) function c100417015.effop(e,tp,eg,ep,ev,re,r,rp)
local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
if Duel.Draw(p,d,REASON_EFFECT)>0 if Duel.Draw(p,d,REASON_EFFECT)>0
and Duel.IsExistingMatchingCard(c100417015.cfilter1,tp,LOCATION_MZONE,0,1,nil) then and Duel.IsExistingMatchingCard(c100417015.cfilter,tp,LOCATION_MZONE,0,1,nil) then
Duel.BreakEffect() Duel.BreakEffect()
Duel.Recover(tp,800,REASON_EFFECT) Duel.Recover(tp,800,REASON_EFFECT)
end end
end end
function c100417015.filter(c)
return c:IsPreviousLocation(LOCATION_GRAVE)
end
function c100417015.spcon(e,tp,eg,ep,ev,re,r,rp) function c100417015.spcon(e,tp,eg,ep,ev,re,r,rp)
return rp~=tp and eg:IsExists(c100417015.filter,1,nil) return rp~=tp and eg:IsExists(c100417015.filter,1,nil)
end end
......
script/c100417016.lua
View file @ 423d0090
--エクソシスター・イレーヌ --エクソシスター・ソフィア
-- --
--Scripted by KillerDJ --Scripted by KillerDJ
function c100417016.initial_effect(c) function c100417016.initial_effect(c)
...@@ -6,11 +6,11 @@ function c100417016.initial_effect(c) ...@@ -6,11 +6,11 @@ function c100417016.initial_effect(c)
--draw --draw
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(100417016,0)) e1:SetDescription(aux.Stringid(100417016,0))
e1:SetCategory(CATEGORY_SPECIAL_SUMMON) e1:SetCategory(CATEGORY_DRAW+CATEGORY_RECOVER)
e1:SetType(EFFECT_TYPE_IGNITION) e1:SetType(EFFECT_TYPE_IGNITION)
e1:SetRange(LOCATION_MZONE) e1:SetRange(LOCATION_MZONE)
e1:SetCountLimit(1,100417016) e1:SetCountLimit(1,100417016)
e1:SetCost(c100417016.effcost) e1:SetCondition(c100417016.effcon)
e1:SetTarget(c100417016.efftg) e1:SetTarget(c100417016.efftg)
e1:SetOperation(c100417016.effop) e1:SetOperation(c100417016.effop)
c:RegisterEffect(e1) c:RegisterEffect(e1)
...@@ -18,6 +18,7 @@ function c100417016.initial_effect(c) ...@@ -18,6 +18,7 @@ function c100417016.initial_effect(c)
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(100417016,1)) e2:SetDescription(aux.Stringid(100417016,1))
e2:SetCategory(CATEGORY_SPECIAL_SUMMON) e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
e2:SetProperty(EFFECT_FLAG_DELAY)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_MOVE) e2:SetCode(EVENT_MOVE)
e2:SetRange(LOCATION_MZONE) e2:SetRange(LOCATION_MZONE)
...@@ -30,11 +31,11 @@ end ...@@ -30,11 +31,11 @@ end
function c100417016.filter(c) function c100417016.filter(c)
return c:IsPreviousLocation(LOCATION_GRAVE) return c:IsPreviousLocation(LOCATION_GRAVE)
end end
function c100417016.effcost(e,tp,eg,ep,ev,re,r,rp,chk) function c100417016.cfilter(c)
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToDeckAsCost,tp,LOCATION_HAND,0,1,nil) end return c:IsFaceup() and c:IsSetCard(0x271)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK) end
local g=Duel.SelectMatchingCard(tp,Card.IsAbleToDeckAsCost,tp,LOCATION_HAND,0,1,1,nil) function c100417016.effcon(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SendtoDeck(g,nil,1,REASON_COST) return Duel.IsExistingMatchingCard(c100417016.cfilter,tp,LOCATION_MZONE,0,1,e:GetHandler())
end end
function c100417016.efftg(e,tp,eg,ep,ev,re,r,rp,chk) function c100417016.efftg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end
...@@ -42,13 +43,13 @@ function c100417016.efftg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -42,13 +43,13 @@ function c100417016.efftg(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetTargetParam(1) Duel.SetTargetParam(1)
Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1) Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
end end
function c100417016.cfilter(c) function c100417016.cfilter1(c)
return c:IsFaceup() and c:IsCode(100417015) return c:IsFaceup() and c:IsCode(100417015)
end end
function c100417016.effop(e,tp,eg,ep,ev,re,r,rp) function c100417016.effop(e,tp,eg,ep,ev,re,r,rp)
local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
if Duel.Draw(p,d,REASON_EFFECT)>0 if Duel.Draw(p,d,REASON_EFFECT)>0
and Duel.IsExistingMatchingCard(c100417016.cfilter,tp,LOCATION_MZONE,0,1,nil) then and Duel.IsExistingMatchingCard(c100417016.cfilter1,tp,LOCATION_MZONE,0,1,nil) then
Duel.BreakEffect() Duel.BreakEffect()
Duel.Recover(tp,800,REASON_EFFECT) Duel.Recover(tp,800,REASON_EFFECT)
end end
......
script/c100417023.lua
View file @ 423d0090
...@@ -58,8 +58,7 @@ end ...@@ -58,8 +58,7 @@ end
function c100417023.bantg(e,tp,eg,ep,ev,re,r,rp,chk) function c100417023.bantg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return true end if chk==0 then return true end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CODE)
getmetatable(e:GetHandler()).announce_filter={TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK,OPCODE_ISTYPE,OPCODE_NOT} local ac=Duel.AnnounceCard(tp)
local ac=Duel.AnnounceCard(tp,table.unpack(getmetatable(e:GetHandler()).announce_filter))
Duel.SetTargetParam(ac) Duel.SetTargetParam(ac)
Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,0) Duel.SetOperationInfo(0,CATEGORY_ANNOUNCE,nil,0,tp,0)
end end
...@@ -111,8 +110,8 @@ function c100417023.disop(e,tp,eg,ep,ev,re,r,rp) ...@@ -111,8 +110,8 @@ function c100417023.disop(e,tp,eg,ep,ev,re,r,rp)
Duel.NegateEffect(ev) Duel.NegateEffect(ev)
end end
function c100417023.descon(e,tp,eg,ep,ev,re,r,rp) function c100417023.descon(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetAttacker() local tc=Duel.GetBattleMonster(tp)
return tc:IsSetCard(0x271) and tc:IsControler(tp) return tc and tc:IsSetCard(0x271) and tc:IsFaceup()
end end
function c100417023.desfilter(c) function c100417023.desfilter(c)
return c:IsType(TYPE_SPELL+TYPE_TRAP) return c:IsType(TYPE_SPELL+TYPE_TRAP)
......
script/c100417036.lua
View file @ 423d0090
...@@ -57,7 +57,7 @@ function c100417036.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -57,7 +57,7 @@ function c100417036.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
local sc=g2:Select(tp,1,1,nil):GetFirst() local sc=g2:Select(tp,1,1,nil):GetFirst()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
local mg=Duel.SelectMatchingCard(aux.NecroValleyFilter(c100417036.eqfilter),tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,tp,sc) local mg=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(c100417036.eqfilter),tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,tp,sc)
Duel.Equip(tp,mg:GetFirst(),sc) Duel.Equip(tp,mg:GetFirst(),sc)
end end
end end
script/c101105087.lua
View file @ 423d0090
...@@ -21,6 +21,7 @@ function c101105087.initial_effect(c) ...@@ -21,6 +21,7 @@ function c101105087.initial_effect(c)
e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH) e2:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
e2:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_SINGLE) e2:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_SINGLE)
e2:SetCode(EVENT_SUMMON_SUCCESS) e2:SetCode(EVENT_SUMMON_SUCCESS)
e2:SetProperty(EFFECT_FLAG_DELAY)
e2:SetCountLimit(1,101105087+100) e2:SetCountLimit(1,101105087+100)
e2:SetTarget(c101105087.thtg) e2:SetTarget(c101105087.thtg)
e2:SetOperation(c101105087.thop) e2:SetOperation(c101105087.thop)
......
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