Commit 1147556c authored by wind2009's avatar wind2009

Merge remote-tracking branch 'upstream/LEDE' into master

parents 17fd7605 9974b610
......@@ -107,4 +107,4 @@ function c18969888.spop(e,tp,eg,ep,ev,re,r,rp)
Duel.Destroy(g,REASON_EFFECT)
end
end
end
\ No newline at end of file
end
......@@ -88,4 +88,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
if g:GetCount()>0 then
Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
end
end
\ No newline at end of file
end
......@@ -74,4 +74,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
e1:SetValue(LOCATION_REMOVED)
c:RegisterEffect(e1,true)
end
end
\ No newline at end of file
end
......@@ -69,4 +69,4 @@ function s.thop2(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) then
Duel.SendtoHand(c,nil,REASON_EFFECT)
end
end
\ No newline at end of file
end
......@@ -90,4 +90,4 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp)
tc:RegisterEffect(e1)
end
end
end
\ No newline at end of file
end
......@@ -72,4 +72,4 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp)
if tc then
Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
end
end
\ No newline at end of file
end
......@@ -59,4 +59,4 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
end
end
end
end
\ No newline at end of file
end
......@@ -77,4 +77,4 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) then
Duel.SSet(tp,c)
end
end
\ No newline at end of file
end
......@@ -84,4 +84,4 @@ function s.thop2(e,tp,eg,ep,ev,re,r,rp)
Duel.SSet(tp,sg,tp,false)
end
end
end
\ No newline at end of file
end
......@@ -59,4 +59,4 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp)
if tc:IsRelateToEffect(e) then
Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP_DEFENSE)
end
end
\ No newline at end of file
end
......@@ -99,4 +99,4 @@ function c27483935.tfop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
local tc=Duel.SelectMatchingCard(tp,c27483935.pfilter,tp,LOCATION_HAND,0,1,1,nil,tp):GetFirst()
if tc then Duel.MoveToField(tc,tp,tp,LOCATION_SZONE,POS_FACEUP,true) end
end
\ No newline at end of file
end
......@@ -39,4 +39,4 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.BreakEffect()
Duel.SpecialSummon(sg,0,tp,tp,false,false,POS_FACEUP)
end
end
\ No newline at end of file
end
......@@ -107,4 +107,4 @@ function c31458630.drop(e,tp,eg,ep,ev,re,r,rp)
Duel.BreakEffect()
Duel.Draw(tp,1,REASON_EFFECT)
end
end
\ No newline at end of file
end
......@@ -55,4 +55,4 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
end
function s.splimit(e,c)
return c:IsLocation(LOCATION_EXTRA)
end
\ No newline at end of file
end
......@@ -78,4 +78,4 @@ end
function s.aclimit(e,re,tp)
local c=re:GetHandler()
return not c:IsSetCard(0x1a3) and re:IsActiveType(TYPE_MONSTER) and c:IsLocation(LOCATION_MZONE)
end
\ No newline at end of file
end
......@@ -87,4 +87,4 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp)
Duel.Damage(1-tp,1000,REASON_EFFECT)
end
end
end
\ No newline at end of file
end
......@@ -106,4 +106,4 @@ function c39114494.riop(e,tp,eg,ep,ev,re,r,rp)
end
Duel.SpecialSummonComplete()
end
end
\ No newline at end of file
end
......@@ -73,4 +73,4 @@ function s.negop(e,tp,eg,ep,ev,re,r,rp)
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE)
c:RegisterEffect(e1)
end
end
\ No newline at end of file
end
......@@ -66,24 +66,19 @@ function s.sccon(e,tp,eg,ep,ev,re,r,rp)
local ph=Duel.GetCurrentPhase()
return ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE
end
function s.mfilter(c)
return not c:IsStatus(STATUS_SUMMONING)
end
function s.sctarg(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler()
local mg=Duel.GetMatchingGroup(s.mfilter,tp,LOCATION_MZONE,0,nil)
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsSynchroSummonable,tp,LOCATION_EXTRA,0,1,nil,c,mg) end
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsSynchroSummonable,tp,LOCATION_EXTRA,0,1,nil,c) end
Duel.Hint(HINT_OPSELECTED,1-tp,aux.Stringid(id,1))
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
end
function s.scop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
if c:IsControler(1-tp) or not c:IsRelateToEffect(e) or c:IsFacedown() then return end
local mg=Duel.GetMatchingGroup(s.mfilter,tp,LOCATION_MZONE,0,nil)
local g=Duel.GetMatchingGroup(Card.IsSynchroSummonable,tp,LOCATION_EXTRA,0,nil,c,mg)
local g=Duel.GetMatchingGroup(Card.IsSynchroSummonable,tp,LOCATION_EXTRA,0,nil,c)
if g:GetCount()>0 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local sg=g:Select(tp,1,1,nil)
Duel.SynchroSummon(tp,sg:GetFirst(),c)
end
end
\ No newline at end of file
end
......@@ -87,4 +87,4 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp)
and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and c:IsRelateToEffect(e) then
Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
end
end
\ No newline at end of file
end
......@@ -79,4 +79,4 @@ function s.tdop(e,tp,eg,ep,ev,re,r,rp)
Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
end
end
end
\ No newline at end of file
end
......@@ -79,4 +79,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.SpecialSummon(g,0,tp,tp,true,false,POS_FACEUP_DEFENSE)
end
end
end
\ No newline at end of file
end
......@@ -64,4 +64,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
if tc:IsRelateToEffect(e) and tc:IsType(TYPE_MONSTER) then
Duel.SendtoHand(tc,nil,REASON_EFFECT)
end
end
\ No newline at end of file
end
......@@ -70,4 +70,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
if g:GetCount()>0 then
Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
end
end
\ No newline at end of file
end
......@@ -61,4 +61,4 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp)
e1:SetValue(LOCATION_REMOVED)
c:RegisterEffect(e1)
end
end
\ No newline at end of file
end
......@@ -125,4 +125,4 @@ function c53541822.activate(e,tp,eg,ep,ev,re,r,rp)
tc:RegisterEffect(e1,true)
end
aux.FCheckAdditional=nil
end
\ No newline at end of file
end
......@@ -58,4 +58,4 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp)
if tg:GetCount()>0 then
Duel.Destroy(tg,REASON_EFFECT)
end
end
\ No newline at end of file
end
......@@ -69,4 +69,4 @@ end
function s.spop1(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetTargetsRelateToChain()
if tc then Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP_DEFENSE) end
end
\ No newline at end of file
end
......@@ -99,4 +99,4 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp)
tc:RegisterEffect(e3)
end
end
end
\ No newline at end of file
end
......@@ -75,4 +75,4 @@ function s.baop(e,tp,eg,ep,ev,re,r,rp)
e1:SetReset(RESET_PHASE+PHASE_END,1)
Duel.RegisterEffect(e1,Duel.GetTurnPlayer())
end
end
\ No newline at end of file
end
......@@ -64,4 +64,4 @@ end
function s.indtg(e,c)
local tc=e:GetHandler()
return c==tc or c==tc:GetBattleTarget()
end
\ No newline at end of file
end
......@@ -75,4 +75,4 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
if not c:IsRelateToEffect(e) then return end
Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
end
\ No newline at end of file
end
......@@ -80,4 +80,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g)
end
end
\ No newline at end of file
end
......@@ -100,4 +100,4 @@ end
function s.fsynlimit(e,c,sumtype)
if not c then return false end
return sumtype==SUMMON_TYPE_FUSION and not c:IsSetCard(0x192)
end
\ No newline at end of file
end
......@@ -70,4 +70,4 @@ function c64603182.aclimit(e,re,tp)
end
function c64603182.actcon(e)
return Duel.GetAttacker()==e:GetHandler()
end
\ No newline at end of file
end
......@@ -92,4 +92,4 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
end
end
end
end
\ No newline at end of file
end
......@@ -98,4 +98,4 @@ function c64881644.penop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) and (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1)) then
Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
end
end
\ No newline at end of file
end
--天盃龍ファドラ
function c65326118.initial_effect(c)
--
--Special summon from grave
local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(65326118,0))
e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
......@@ -19,7 +19,7 @@ function c65326118.initial_effect(c)
e3:SetCode(EVENT_BATTLE_START)
e3:SetRange(LOCATION_MZONE)
c:RegisterEffect(e3)
--
--inde
local e4=Effect.CreateEffect(c)
e4:SetType(EFFECT_TYPE_FIELD)
e4:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
......@@ -28,7 +28,7 @@ function c65326118.initial_effect(c)
e4:SetTarget(c65326118.indtg)
e4:SetValue(1)
c:RegisterEffect(e4)
--
--synchro summon
local e5=Effect.CreateEffect(c)
e5:SetDescription(aux.Stringid(65326118,2))
e5:SetCategory(CATEGORY_SPECIAL_SUMMON)
......@@ -69,20 +69,15 @@ function c65326118.sccon(e,tp,eg,ep,ev,re,r,rp)
local ph=Duel.GetCurrentPhase()
return ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE
end
function c65326118.mfilter(c)
return not c:IsStatus(STATUS_SUMMONING)
end
function c65326118.sctg(e,tp,eg,ep,ev,re,r,rp,chk)
local mg=Duel.GetMatchingGroup(c65326118.mfilter,tp,LOCATION_MZONE,0,nil)
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsSynchroSummonable,tp,LOCATION_EXTRA,0,1,nil,e:GetHandler(),mg) end
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsSynchroSummonable,tp,LOCATION_EXTRA,0,1,nil,e:GetHandler()) end
Duel.Hint(HINT_OPSELECTED,1-tp,aux.Stringid(65326118,2))
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
end
function c65326118.scop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
local mg=Duel.GetMatchingGroup(c65326118.mfilter,tp,LOCATION_MZONE,0,nil)
if c:IsControler(1-tp) or not c:IsRelateToEffect(e) or c:IsFacedown() then return end
local g=Duel.GetMatchingGroup(Card.IsSynchroSummonable,tp,LOCATION_EXTRA,0,nil,c,mg)
local g=Duel.GetMatchingGroup(Card.IsSynchroSummonable,tp,LOCATION_EXTRA,0,nil,c)
if g:GetCount()>0 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local sg=g:Select(tp,1,1,nil)
......
......@@ -56,4 +56,4 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp,op)
Duel.ConfirmCards(1-tp,sg)
end
end
end
\ No newline at end of file
end
......@@ -78,4 +78,4 @@ function s.negop(e,tp,eg,ep,ev,re,r,rp)
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE)
c:RegisterEffect(e1)
end
end
\ No newline at end of file
end
......@@ -98,4 +98,4 @@ function s.tdop(e,tp,eg,ep,ev,re,r,rp)
Duel.HintSelection(g)
Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
end
end
\ No newline at end of file
end
......@@ -77,4 +77,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
end
function s.splimit(e,c,sump,sumtype,sumpos,targetp,se)
return not c:IsRace(RACE_INSECT+RACE_PLANT+RACE_REPTILE)
end
\ No newline at end of file
end
......@@ -111,4 +111,4 @@ end
function s.desop(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.GetMatchingGroup(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
Duel.Destroy(g,REASON_EFFECT)
end
\ No newline at end of file
end
......@@ -85,4 +85,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
end
function s.splimit(e,c,sump,sumtype,sumpos,targetp,se)
return not c:IsRace(RACE_INSECT+RACE_PLANT+RACE_REPTILE)
end
\ No newline at end of file
end
......@@ -73,4 +73,4 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp)
e1:SetValue(TYPE_TRAP+TYPE_CONTINUOUS)
tc:RegisterEffect(e1)
end
end
\ No newline at end of file
end
......@@ -90,4 +90,4 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp)
Duel.Destroy(tc,REASON_EFFECT)
end
end
end
\ No newline at end of file
end
......@@ -71,4 +71,4 @@ function s.dactivate(e,tp,eg,ep,ev,re,r,rp)
if ct1>0 or ct2>0 then Duel.BreakEffect() end
if ct1>0 then Duel.Draw(tp,ct1,REASON_EFFECT) end
if ct2>0 then Duel.Draw(1-tp,ct2,REASON_EFFECT) end
end
\ No newline at end of file
end
......@@ -90,4 +90,4 @@ function s.gyop(e,tp,eg,ep,ev,re,r,rp)
if tc:IsRelateToEffect(e) then
Duel.SendtoGrave(tc,REASON_EFFECT)
end
end
\ No newline at end of file
end
......@@ -98,4 +98,4 @@ function c82570174.spop2(e,tp,eg,ep,ev,re,r,rp)
Duel.Destroy(g,REASON_EFFECT)
end
end
end
\ No newline at end of file
end
......@@ -119,4 +119,4 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp)
if #g>0 then
Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
end
end
\ No newline at end of file
end
......@@ -89,4 +89,4 @@ function s.descon(e,tp,eg,ep,ev,re,r,rp)
end
function s.desop(e,tp,eg,ep,ev,re,r,rp)
Duel.Destroy(e:GetLabelObject(),REASON_EFFECT)
end
\ No newline at end of file
end
......@@ -60,4 +60,4 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
Duel.SendtoHand(g,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g)
end
end
\ No newline at end of file
end
......@@ -65,4 +65,4 @@ function s.desop2(e,tp,eg,ep,ev,re,r,rp)
if tc:IsRelateToEffect(e) then
Duel.Destroy(tc,REASON_EFFECT)
end
end
\ No newline at end of file
end
......@@ -107,4 +107,4 @@ function c90276649.penop(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) and (Duel.CheckLocation(tp,LOCATION_PZONE,0) or Duel.CheckLocation(tp,LOCATION_PZONE,1)) then
Duel.MoveToField(c,tp,tp,LOCATION_PZONE,POS_FACEUP,true)
end
end
\ No newline at end of file
end
......@@ -90,4 +90,4 @@ function s.matop(e,tp,eg,ep,ev,re,r,rp)
if tc1 and tc1:IsControler(tp) and tc2 then
Duel.Overlay(tc1,tc2)
end
end
\ No newline at end of file
end
......@@ -67,4 +67,4 @@ function c91098230.desop(e,tp,eg,ep,ev,re,r,rp)
end
function c91098230.atktg(e,c)
return c:IsCode(83104731) or aux.IsCodeListed(c,83104731)
end
\ No newline at end of file
end
--天盃龍チュンドラ
function c91810826.initial_effect(c)
--
--Self special summon
local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(91810826,0))
e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
......@@ -11,7 +11,7 @@ function c91810826.initial_effect(c)
e1:SetTarget(c91810826.sptg)
e1:SetOperation(c91810826.spop)
c:RegisterEffect(e1)
--
--Special summon from deck
local e2=Effect.CreateEffect(c)
e2:SetDescription(aux.Stringid(91810826,1))
e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
......@@ -23,7 +23,7 @@ function c91810826.initial_effect(c)
e2:SetTarget(c91810826.sptg2)
e2:SetOperation(c91810826.spop2)
c:RegisterEffect(e2)
--
--Synchro summon
local e3=Effect.CreateEffect(c)
e3:SetDescription(aux.Stringid(91810826,2))
e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
......@@ -75,23 +75,18 @@ function c91810826.sccon(e,tp,eg,ep,ev,re,r,rp)
local ph=Duel.GetCurrentPhase()
return ph>=PHASE_BATTLE_START and ph<=PHASE_BATTLE
end
function c91810826.mfilter(c)
return not c:IsStatus(STATUS_SUMMONING)
end
function c91810826.sctg(e,tp,eg,ep,ev,re,r,rp,chk)
local mg=Duel.GetMatchingGroup(c91810826.mfilter,tp,LOCATION_MZONE,0,nil)
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsSynchroSummonable,tp,LOCATION_EXTRA,0,1,nil,e:GetHandler(),mg) end
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsSynchroSummonable,tp,LOCATION_EXTRA,0,1,nil,e:GetHandler()) end
Duel.Hint(HINT_OPSELECTED,1-tp,aux.Stringid(91810826,2))
Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
end
function c91810826.scop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
if c:IsControler(1-tp) or not c:IsRelateToEffect(e) or c:IsFacedown() then return end
local mg=Duel.GetMatchingGroup(c91810826.mfilter,tp,LOCATION_MZONE,0,nil)
local g=Duel.GetMatchingGroup(Card.IsSynchroSummonable,tp,LOCATION_EXTRA,0,nil,c,mg)
local g=Duel.GetMatchingGroup(Card.IsSynchroSummonable,tp,LOCATION_EXTRA,0,nil,c)
if g:GetCount()>0 then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local sg=g:Select(tp,1,1,nil)
Duel.SynchroSummon(tp,sg:GetFirst(),c)
end
end
\ No newline at end of file
end
......@@ -104,4 +104,4 @@ function s.tdop(e,tp,eg,ep,ev,re,r,rp)
if g:GetCount()>0 then
Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)
end
end
\ No newline at end of file
end
......@@ -58,4 +58,4 @@ function s.setop(e,tp,eg,ep,ev,re,r,rp)
if g:GetCount()>0 then
Duel.SSet(tp,g)
end
end
\ No newline at end of file
end
......@@ -87,4 +87,4 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp)
if g:GetCount()>0 then
Duel.SendtoGrave(g,REASON_EFFECT)
end
end
\ No newline at end of file
end
......@@ -67,4 +67,4 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp)
if tc:IsRelateToEffect(e) then
Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)
end
end
\ No newline at end of file
end
......@@ -105,4 +105,4 @@ function s.spop2(e,tp,eg,ep,ev,re,r,rp)
e1:SetValue(-4)
c:RegisterEffect(e1)
end
end
\ No newline at end of file
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