Commit c91a58f9 authored by argon.sun's avatar argon.sun

Merge branch 'master' of github.com:Fluorohydride/ygopro

parents b272fb13 4aed66e7
--Reborn Tengu --݆h칷
function c10028593.initial_effect(c) function c10028593.initial_effect(c)
--spsummon --spsummon
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
...@@ -28,16 +28,20 @@ function c10365322.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -28,16 +28,20 @@ function c10365322.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,0) Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,0)
end end
function c10365322.desop(e,tp,eg,ep,ev,re,r,rp) function c10365322.desop(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS) local tc=Duel.GetFirstTarget()
local tc=g:GetFirst()
local c=e:GetHandler() local c=e:GetHandler()
local dam=tc:IsRelateToEffect(e) and c:IsRelateToEffect(e) if not tc:IsRelateToEffect(e) and not c:IsRelateToEffect(e) then return end
local dg=Group.FromCards(c,tc) if not tc:IsRelateToEffect(e) then
Duel.Destroy(dg,REASON_EFFECT) Duel.Destroy(c,REASON_EFFECT)
if dam and tc:IsLocation(LOCATION_GRAVE) and c:IsLocation(LOCATION_GRAVE) then elseif not c:IsRelateToEffect(e) then
Duel.BreakEffect() Duel.Destroy(tc,REASON_EFFECT)
local d=tc:GetAttack() else
if d<0 then d=0 end local dg=Group.FromCards(c,tc)
Duel.Damage(1-tp,d,REASON_EFFECT) if Duel.Destroy(dg,REASON_EFFECT)==2 and tc:IsLocation(LOCATION_GRAVE) and c:IsLocation(LOCATION_GRAVE) then
Duel.BreakEffect()
local d=tc:GetAttack()
if d<0 then d=0 end
Duel.Damage(1-tp,d,REASON_EFFECT)
end
end end
end end
--Tour Guide From the Underworld --魔界発現世行きデスガイド
function c10802915.initial_effect(c) function c10802915.initial_effect(c)
--spsummon --spsummon
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
......
--Latinum, Exarch of Dark World --\L
function c15667446.initial_effect(c) function c15667446.initial_effect(c)
--spsummon --spsummon
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Evolsaur Pelta --`ڥ륿
function c16480084.initial_effect(c) function c16480084.initial_effect(c)
end end
function c16480084.evolreg(c) function c16480084.evolreg(c)
......
--Shadow of the Six Samurai - Shien --
function c1828513.initial_effect(c) function c1828513.initial_effect(c)
--xyz summon --xyz summon
aux.AddXyzProcedure(c,c1828513.xyzfilter,2) aux.AddXyzProcedure(c,c1828513.xyzfilter,2)
......
--Fish and Swaps --フィッシュアンドバックス
function c21507589.initial_effect(c) function c21507589.initial_effect(c)
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Pain Painter --ڥڥ󥿩`
function c21620076.initial_effect(c) function c21620076.initial_effect(c)
--alias --alias
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
...@@ -33,7 +33,7 @@ function c21620076.lvop(e,tp,eg,ep,ev,re,r,rp) ...@@ -33,7 +33,7 @@ function c21620076.lvop(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS):Filter(Card.IsRelateToEffect,nil,e) local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS):Filter(Card.IsRelateToEffect,nil,e)
local tc=g:GetFirst() local tc=g:GetFirst()
while tc do while tc do
if c21620076.lvfilter(tc) then if tc:IsFaceup() then
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_CHANGE_LEVEL) e1:SetCode(EFFECT_CHANGE_LEVEL)
......
--Sea Lancer --`󥵩`
function c22842214.initial_effect(c) function c22842214.initial_effect(c)
--equip --equip
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Evo-Instant --ͻȻM
function c24362891.initial_effect(c) function c24362891.initial_effect(c)
--Special Summon --Special Summon
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Interplanetarypurplythorny Dragon --μϸo
function c25206027.initial_effect(c) function c25206027.initial_effect(c)
--special summon --special summon
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Wind-Up Shark --ޥ`
function c25484449.initial_effect(c) function c25484449.initial_effect(c)
--spsummon --spsummon
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Vampire Dragon --ヴァンパイア,ドラゴン
function c36352429.initial_effect(c) function c36352429.initial_effect(c)
--search --search
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Dark Smog --
function c41930553.initial_effect(c) function c41930553.initial_effect(c)
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Evolzar Dolkka --エヴォルカイザー·ドルカ
function c42752141.initial_effect(c) function c42752141.initial_effect(c)
--xyz summon --xyz summon
aux.AddXyzProcedure(c,c42752141.xyzfilter,2) aux.AddXyzProcedure(c,c42752141.xyzfilter,2)
......
--Wind-Up Rabbit --ޥӥå
function c42874792.initial_effect(c) function c42874792.initial_effect(c)
--remove --remove
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Full House --եϥ
function c45178472.initial_effect(c) function c45178472.initial_effect(c)
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Xyz Territory --エクシーズ·テリトリー
function c4545854.initial_effect(c) function c4545854.initial_effect(c)
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Psi-Beast --åө`
function c46291010.initial_effect(c) function c46291010.initial_effect(c)
--remove --remove
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
...@@ -19,11 +19,10 @@ function c46291010.rmtg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -19,11 +19,10 @@ function c46291010.rmtg(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function c46291010.rmop(e,tp,eg,ep,ev,re,r,rp) function c46291010.rmop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:IsFacedown() or not c:IsRelateToEffect(e) then return end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
local g=Duel.SelectMatchingCard(tp,c46291010.filter,tp,LOCATION_DECK,0,1,1,nil,c:GetLevel()) local g=Duel.SelectMatchingCard(tp,c46291010.filter,tp,LOCATION_DECK,0,1,1,nil,c:GetLevel())
local tc=g:GetFirst() local tc=g:GetFirst()
if tc then if tc and c:IsRelateToEffect(e) and c:IsFaceup() then
Duel.Remove(tc,POS_FACEUP,REASON_EFFECT) Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_SINGLE)
......
--Dodger Dragon --ܥɡɥ饴
function c47013502.initial_effect(c) function c47013502.initial_effect(c)
--summon --summon
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Ninjitsu Art of Duplication --̷ g
function c50766506.initial_effect(c) function c50766506.initial_effect(c)
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Photon Trident --フォトン,トライデント
function c51589188.initial_effect(c) function c51589188.initial_effect(c)
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Inzektor Hopper --׳װC ۥåѩ`
function c52601736.initial_effect(c) function c52601736.initial_effect(c)
--equip --equip
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Tour Bus From the Underworld --ħkFФХ
function c52823314.initial_effect(c) function c52823314.initial_effect(c)
--to deck --to deck
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Painful Return --
function c57902193.initial_effect(c) function c57902193.initial_effect(c)
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetCategory(CATEGORY_TOHAND) e1:SetCategory(CATEGORY_TOHAND)
e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetCountLimit(1) e1:SetCountLimit(1)
...@@ -14,15 +13,15 @@ end ...@@ -14,15 +13,15 @@ end
function c57902193.filter(c) function c57902193.filter(c)
return c:IsType(TYPE_MONSTER) and c:IsAbleToHand() return c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
end end
function c57902193.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function c57902193.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_GRAVE) and c57902193.filter(chkc) end if chk==0 then return Duel.IsExistingMatchingCard(c57902193.filter,tp,LOCATION_GRAVE,0,1,nil) end
if chk==0 then return Duel.IsExistingTarget(c57902193.filter,tp,LOCATION_GRAVE,0,1,nil) end Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_GRAVE)
Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND)
Duel.SelectTarget(1-tp,c57902193.filter,tp,LOCATION_GRAVE,0,1,1,nil)
end end
function c57902193.activate(e,tp,eg,ep,ev,re,r,rp) function c57902193.activate(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND)
if tc:IsRelateToEffect(e) then local g=Duel.SelectMatchingCard(1-tp,c57902193.filter,tp,LOCATION_GRAVE,0,1,1,nil)
local tc=g:GetFirst()
if tc then
local e1=Effect.CreateEffect(e:GetHandler()) local e1=Effect.CreateEffect(e:GetHandler())
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e1:SetCode(EVENT_PHASE+PHASE_END) e1:SetCode(EVENT_PHASE+PHASE_END)
...@@ -35,5 +34,7 @@ function c57902193.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -35,5 +34,7 @@ function c57902193.activate(e,tp,eg,ep,ev,re,r,rp)
end end
function c57902193.thop(e,tp,eg,ep,ev,re,r,rp) function c57902193.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.SendtoHand(e:GetHandler(),nil,REASON_EFFECT) Duel.SendtoHand(e:GetHandler(),nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,e:GetHandler()) if e:GetHandler():IsLocation(LOCATION_HAND) then
Duel.ConfirmCards(1-tp,e:GetHandler())
end
end end
--Orient Dragon --ꥨȡɥ饴
function c68124775.initial_effect(c) function c68124775.initial_effect(c)
--synchro summon --synchro summon
aux.AddSynchroProcedure(c,nil,aux.NonTuner(nil),1) aux.AddSynchroProcedure(c,nil,aux.NonTuner(nil),1)
......
--Piercing Moray --ĥĥ
function c69846323.initial_effect(c) function c69846323.initial_effect(c)
--atkup --atkup
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Psychic Shockwave --サイコ·ショックウェーブ
function c72563071.initial_effect(c) function c72563071.initial_effect(c)
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Gladiator Beast Essedarii --L
function c73285669.initial_effect(c) function c73285669.initial_effect(c)
--fusion material --fusion material
c:EnableReviveLimit() c:EnableReviveLimit()
......
--Mara of the Nordic Alfar --O둥ȥ`
function c73417207.initial_effect(c) function c73417207.initial_effect(c)
--synchro custom --synchro custom
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--D-Boyz --Dܩ`
function c79279397.initial_effect(c) function c79279397.initial_effect(c)
--spsummon --spsummon
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Photon Sabre Tiger --フォトン·サーベルタイガー
function c80495985.initial_effect(c) function c80495985.initial_effect(c)
--search --search
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Inzektor Axe - Zektahawk --樅單蚾及藹葦 未弁玄石奈弁
function c87973893.initial_effect(c) function c87973893.initial_effect(c)
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Evoltile Najasho --ɡʥϥ
function c88095331.initial_effect(c) function c88095331.initial_effect(c)
--search --search
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
...@@ -6,7 +6,7 @@ function c88095331.initial_effect(c) ...@@ -6,7 +6,7 @@ function c88095331.initial_effect(c)
e1:SetCategory(CATEGORY_SPECIAL_SUMMON) e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
e1:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_SINGLE) e1:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_SINGLE)
e1:SetCode(EVENT_RELEASE) e1:SetCode(EVENT_RELEASE)
e1:SetProperty(EFFECT_FLAG_DELAY) e1:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP)
e1:SetCondition(c88095331.condition) e1:SetCondition(c88095331.condition)
e1:SetTarget(c88095331.target) e1:SetTarget(c88095331.target)
e1:SetOperation(c88095331.operation) e1:SetOperation(c88095331.operation)
......
--Smashing Horn --½ÇµÑ³Z¤­
function c93396832.initial_effect(c) function c93396832.initial_effect(c)
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
...@@ -16,6 +16,7 @@ function c93717133.initial_effect(c) ...@@ -16,6 +16,7 @@ function c93717133.initial_effect(c)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_QUICK_O) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_QUICK_O)
e2:SetCode(EVENT_FREE_CHAIN) e2:SetCode(EVENT_FREE_CHAIN)
e2:SetProperty(EFFECT_FLAG_CARD_TARGET) e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
e2:SetHintTiming(TIMING_BATTLE_PHASE)
e2:SetRange(LOCATION_MZONE) e2:SetRange(LOCATION_MZONE)
e2:SetCondition(c93717133.rmcon) e2:SetCondition(c93717133.rmcon)
e2:SetTarget(c93717133.rmtg) e2:SetTarget(c93717133.rmtg)
...@@ -37,8 +38,8 @@ function c93717133.rmtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) ...@@ -37,8 +38,8 @@ function c93717133.rmtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return false end if chkc then return false end
local a=Duel.GetAttacker() local a=Duel.GetAttacker()
local d=Duel.GetAttackTarget() local d=Duel.GetAttackTarget()
if chk==0 then return (a==e:GetHandler() and d and d:IsCanBeEffectTarget(e) and a:IsAbleToRemove() and d:IsAbleToRemove()) if chk==0 then return (a==e:GetHandler() and d and d:IsOnField() and d:IsCanBeEffectTarget(e) and a:IsAbleToRemove() and d:IsAbleToRemove())
or (d==e:GetHandler() and a:IsCanBeEffectTarget(e) and a:IsAbleToRemove() and d:IsAbleToRemove()) end or (d==e:GetHandler() and a:IsOnField() and a:IsCanBeEffectTarget(e) and a:IsAbleToRemove() and d:IsAbleToRemove()) end
if a==e:GetHandler() then Duel.SetTargetCard(d) if a==e:GetHandler() then Duel.SetTargetCard(d)
else Duel.SetTargetCard(a) end else Duel.SetTargetCard(a) end
local g=Group.FromCards(a,d) local g=Group.FromCards(a,d)
......
--Adreus, Keeper of Armageddon --皺挸及忐荾氪失玉伊它旦
function c94119480.initial_effect(c) function c94119480.initial_effect(c)
--xyz summon --xyz summon
aux.AddXyzProcedure(c,aux.FilterEqualFunction(Card.GetLevel,5),2) aux.AddXyzProcedure(c,aux.FilterEqualFunction(Card.GetLevel,5),2)
......
--Lost Blue Breaker --ロスト·ブルー·ブレイカー
function c95231062.initial_effect(c) function c95231062.initial_effect(c)
--destroy --destroy
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Xyz Veil --``
function c96457619.initial_effect(c) function c96457619.initial_effect(c)
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--Gladiator Taming --L{
function c9780364.initial_effect(c) function c9780364.initial_effect(c)
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
--White Dragon Ninja --׸o
function c99212922.initial_effect(c) function c99212922.initial_effect(c)
--spsummon limit --spsummon limit
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
......
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