Commit 8359b5c3 authored by POLYMER's avatar POLYMER

fix

parent 25758af1
...@@ -221,7 +221,7 @@ function c11513086.mnfilter2(c,mc) ...@@ -221,7 +221,7 @@ function c11513086.mnfilter2(c,mc)
return math.abs(c:GetLevel()-mc:GetLevel())==4 return math.abs(c:GetLevel()-mc:GetLevel())==4
end end
function c11513086.fselect(g,tp,sc) function c11513086.fselect(g,tp,sc)
return g:GetCount()==2 and g:IsExists(Card.IsSetCard,1,nil,0x1a2) and g:IsExists(c11513086.mnfilter,1,nil,g) and g:GetClassCount(Card.GetLocation)==2 return g:GetCount()==2 and g:IsExists(Card.IsSetCard,1,nil,0x1a2) and g:IsExists(c11513086.mnfilter,1,nil,g)
end end
function c11513086.target(e,tp,eg,ep,ev,re,r,rp,chk) function c11513086.target(e,tp,eg,ep,ev,re,r,rp,chk)
local g=Duel.GetMatchingGroup(c11513086.tgrfilter,tp,LOCATION_MZONE+LOCATION_HAND,0,nil) local g=Duel.GetMatchingGroup(c11513086.tgrfilter,tp,LOCATION_MZONE+LOCATION_HAND,0,nil)
......
...@@ -83,13 +83,13 @@ function s.costop(e,tp,eg,ep,ev,re,r,rp) ...@@ -83,13 +83,13 @@ function s.costop(e,tp,eg,ep,ev,re,r,rp)
s[0]=true s[0]=true
local bool=false local bool=false
--if KOISHI_CHECK then --if KOISHI_CHECK then
-- local effects={tc:GetCardRegistered(nil,GETEFFECT_INITIAL)} -- local effects={tc:GetCardRegistered(nil,GETEFFECT_INITIAL)}
-- for _,ce in ipairs(effects) do -- for _,ce in ipairs(effects) do
-- if s.issameeffect(te,ce) then -- if s.issameeffect(te,ce) then
-- bool=true -- bool=true
-- break -- break
-- end -- end
-- end -- end
--else --else
bool=true bool=true
--end --end
...@@ -228,6 +228,7 @@ local function GetFunctionSignature(func) ...@@ -228,6 +228,7 @@ local function GetFunctionSignature(func)
return table.concat(t) return table.concat(t)
end end
function s.issamefunc(f1,f2,bool) function s.issamefunc(f1,f2,bool)
if f1==nil and f2==nil then return true end
if aux.GetValueType(f1)~="function" or aux.GetValueType(f2)~= "function" then if aux.GetValueType(f1)~="function" or aux.GetValueType(f2)~= "function" then
return false return false
end end
...@@ -238,7 +239,7 @@ function s.issamefunc(f1,f2,bool) ...@@ -238,7 +239,7 @@ function s.issamefunc(f1,f2,bool)
local d2=string.dump(f2) local d2=string.dump(f2)
if d1==d2 then if d1==d2 then
--Debug.Message(f1) --Debug.Message(f1)
--Debug.Message(f2) --Debug.Message(f2)
return true return true
elseif bool then elseif bool then
f1(e,tp,eg,ep,ev,re,r,rp,1) f1(e,tp,eg,ep,ev,re,r,rp,1)
...@@ -256,10 +257,9 @@ function s.issameeffect(e1,e2) ...@@ -256,10 +257,9 @@ function s.issameeffect(e1,e2)
local code1=e1:GetCode() local code1=e1:GetCode()
local code2=e2:GetCode() local code2=e2:GetCode()
local res1=s.issamefunc(tg,e2:GetTarget()) local res1=s.issamefunc(tg,e2:GetTarget())
local res2=op==nil or s.issamefunc(op,e2:GetOperation()) local res2=s.issamefunc(op,e2:GetOperation())
local res3=code1==code2 or code1 and code2 and code1*code2==EVENT_SPSUMMON_SUCCESS*EVENT_SUMMON_SUCCESS local res3=code1==code2 or code1 and code2 and code1*code2==EVENT_SPSUMMON_SUCCESS*EVENT_SUMMON_SUCCESS
--if Duel.GetTurnCount()==2 then tg(e1,tp,eg,ep,ev,re,r,rp,1) end --if Duel.GetTurnCount()==2 then tg(e1,tp,eg,ep,ev,re,r,rp,1) end
--if Duel.GetTurnCount()==2 then Debug.Message(res1) end
return res1 and res2 and res3 return res1 and res2 and res3
end end
function s.addData(ctable,cdata) function s.addData(ctable,cdata)
......
...@@ -91,6 +91,7 @@ function c67201623.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -91,6 +91,7 @@ function c67201623.activate(e,tp,eg,ep,ev,re,r,rp)
if spct>0 and c:IsRelateToEffect(e) and c:IsCanOverlay() and tc:IsCanOverlay() and Duel.IsExistingMatchingCard(c67201623.matfilter,tp,LOCATION_MZONE,0,1,tc) and Duel.SelectYesNo(tp,aux.Stringid(67201623,2)) then if spct>0 and c:IsRelateToEffect(e) and c:IsCanOverlay() and tc:IsCanOverlay() and Duel.IsExistingMatchingCard(c67201623.matfilter,tp,LOCATION_MZONE,0,1,tc) and Duel.SelectYesNo(tp,aux.Stringid(67201623,2)) then
Duel.BreakEffect() Duel.BreakEffect()
c:CancelToGrave() c:CancelToGrave()
tc:CancelToGrave()
local ttc=Duel.SelectMatchingCard(tp,c67201623.matfilter,tp,LOCATION_MZONE,0,1,1,tc):GetFirst() local ttc=Duel.SelectMatchingCard(tp,c67201623.matfilter,tp,LOCATION_MZONE,0,1,1,tc):GetFirst()
if c:IsRelateToEffect(e) and not ttc:IsImmuneToEffect(e) then if c:IsRelateToEffect(e) and not ttc:IsImmuneToEffect(e) then
local og=tc:GetOverlayGroup() local og=tc:GetOverlayGroup()
......
...@@ -3,6 +3,7 @@ yume=yume or {} ...@@ -3,6 +3,7 @@ yume=yume or {}
if c71403001 then if c71403001 then
---@param c Card ---@param c Card
function c71403001.initial_effect(c) function c71403001.initial_effect(c)
if yume.import_flag then return end
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(71403001,0)) e1:SetDescription(aux.Stringid(71403001,0))
......
--气泡方块使 T --气泡方块使 T
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card
function c71403002.initial_effect(c) function c71403002.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--pendulum summon --pendulum summon
aux.EnablePendulumAttribute(c,true) aux.EnablePendulumAttribute(c,true)
--scale --scale
......
--气泡方块使 I --气泡方块使 I
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card ---@param c Card
function c71403003.initial_effect(c) function c71403003.initial_effect(c)
--pendulum summon if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end --pendulum summon
aux.EnablePendulumAttribute(c,true) aux.EnablePendulumAttribute(c,true)
--scale --scale
local ep1=Effect.CreateEffect(c) local ep1=Effect.CreateEffect(c)
......
--气泡方块使 S --气泡方块使 S
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card ---@param c Card
function c71403004.initial_effect(c) function c71403004.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--pendulum summon --pendulum summon
aux.EnablePendulumAttribute(c,true) aux.EnablePendulumAttribute(c,true)
--scale --scale
......
--气泡方块使 Z --气泡方块使 Z
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card ---@param c Card
function c71403005.initial_effect(c) function c71403005.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--pendulum summon --pendulum summon
aux.EnablePendulumAttribute(c,true) aux.EnablePendulumAttribute(c,true)
--scale --scale
......
--T旋爆裂! --T旋爆裂!
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card ---@param c Card
function c71403006.initial_effect(c) function c71403006.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(71403006,0)) e1:SetDescription(aux.Stringid(71403006,0))
......
--TETRIS! --TETRIS!
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card ---@param c Card
function c71403008.initial_effect(c) function c71403008.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(71403008,0)) e1:SetDescription(aux.Stringid(71403008,0))
......
--美学魔术! --美学魔术!
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card ---@param c Card
function c71403009.initial_effect(c) function c71403009.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--Activate --Activate
local e0=Effect.CreateEffect(c) local e0=Effect.CreateEffect(c)
e0:SetType(EFFECT_TYPE_ACTIVATE) e0:SetType(EFFECT_TYPE_ACTIVATE)
......
--存块!旋转! --存块!旋转!
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card ---@param c Card
function c71403010.initial_effect(c) function c71403010.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(71403014,0)) e1:SetDescription(aux.Stringid(71403014,0))
......
--气泡方块的星舰舰长 T --气泡方块的星舰舰长 T
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card ---@param c Card
function c71403011.initial_effect(c) function c71403011.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--xyz summon --xyz summon
aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsXyzType,TYPE_PENDULUM),4,2,nil,nil,99) aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsXyzType,TYPE_PENDULUM),4,2,nil,nil,99)
c:EnableReviveLimit() c:EnableReviveLimit()
......
--气泡方块使 J&L --气泡方块使 J&L
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card ---@param c Card
function c71403012.initial_effect(c) function c71403012.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--pendulum summon --pendulum summon
aux.EnablePendulumAttribute(c,true) aux.EnablePendulumAttribute(c,true)
--scale --scale
......
--气泡方块使 O --气泡方块使 O
---@param c Card ---@param c Card
if not c71403001 then dofile("expansions/script/c71403001.lua") end
function c71403013.initial_effect(c) function c71403013.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--pendulum summon --pendulum summon
aux.EnablePendulumAttribute(c,true) aux.EnablePendulumAttribute(c,true)
--scale --scale
......
--两个人在一起就是最强的! --两个人在一起就是最强的!
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card ---@param c Card
function c71403014.initial_effect(c) function c71403014.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(71403014,0)) e1:SetDescription(aux.Stringid(71403014,0))
......
--气泡方块的淘气双子 J&L --气泡方块的淘气双子 J&L
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card ---@param c Card
function c71403015.initial_effect(c) function c71403015.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--xyz summon --xyz summon
aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsXyzType,TYPE_PENDULUM),4,2,nil,nil,99) aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsXyzType,TYPE_PENDULUM),4,2,nil,nil,99)
c:EnableReviveLimit() c:EnableReviveLimit()
......
--气泡方块的千金与管家 S&Z --气泡方块的千金与管家 S&Z
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card ---@param c Card
function c71403016.initial_effect(c) function c71403016.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--xyz summon --xyz summon
aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsXyzType,TYPE_PENDULUM),4,2,nil,nil,99) aux.AddXyzProcedure(c,aux.FilterBoolFunction(Card.IsXyzType,TYPE_PENDULUM),4,2,nil,nil,99)
c:EnableReviveLimit() c:EnableReviveLimit()
......
--我来做你的对手。 --我来做你的对手。
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card ---@param c Card
function c71403017.initial_effect(c) function c71403017.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(71403014,0)) e1:SetDescription(aux.Stringid(71403014,0))
......
--魔法气泡连锁! --魔法气泡连锁!
local s,id,o=GetID() local s,id,o=GetID()
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card ---@param c Card
function s.initial_effect(c) function s.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(id,0)) e1:SetDescription(aux.Stringid(id,0))
......
--气泡方块使 林檎 --气泡方块使 林檎
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card ---@param c Card
function c71403019.initial_effect(c) function c71403019.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--pendulum summon --pendulum summon
aux.EnablePendulumAttribute(c,true) aux.EnablePendulumAttribute(c,true)
--scale --scale
......
--气泡方块使 亚鲁鲁 --气泡方块使 亚鲁鲁
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card ---@param c Card
function c71403021.initial_effect(c) function c71403021.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--pendulum summon --pendulum summon
aux.EnablePendulumAttribute(c,true) aux.EnablePendulumAttribute(c,true)
--scale --scale
......
--气泡方块的见习法师与搭档 亚鲁鲁·娜嘉&卡邦可 --气泡方块的见习法师与搭档 亚鲁鲁·娜嘉&卡邦可
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card ---@param c Card
function c71403022.initial_effect(c) function c71403022.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--syn summon --syn summon
aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSynchroType,TYPE_PENDULUM),aux.NonTuner(aux.FilterBoolFunction(Card.IsSynchroType,TYPE_PENDULUM)),1,1) aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSynchroType,TYPE_PENDULUM),aux.NonTuner(aux.FilterBoolFunction(Card.IsSynchroType,TYPE_PENDULUM)),1,1)
c:EnableReviveLimit() c:EnableReviveLimit()
......
--L-J幻象! --L-J幻象!
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card ---@param c Card
function c71403023.initial_effect(c) function c71403023.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--destroy --destroy
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(71403023,0)) e1:SetDescription(aux.Stringid(71403023,0))
......
--气泡方块的女中学生 安藤林檎 --气泡方块的女中学生 安藤林檎
local s,id,o=GetID() local s,id,o=GetID()
if not c71403001 then dofile("expansions/script/c71403001.lua") end
---@param c Card ---@param c Card
function s.initial_effect(c) function s.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--syn summon --syn summon
aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSynchroType,TYPE_PENDULUM),aux.NonTuner(aux.FilterBoolFunction(Card.IsSynchroType,TYPE_PENDULUM)),1) aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsSynchroType,TYPE_PENDULUM),aux.NonTuner(aux.FilterBoolFunction(Card.IsSynchroType,TYPE_PENDULUM)),1)
c:EnableReviveLimit() c:EnableReviveLimit()
......
--正弦!余弦!正切! --正弦!余弦!正切!
local s,id,o=GetID() local s,id,o=GetID()
if not c71403001 then dofile("expansions/script/c71403001.lua") end
function s.initial_effect(c) function s.initial_effect(c)
if not (yume and yume.PPT_loaded) then
yume=yume or {}
yume.import_flag=true
c:CopyEffect(71403001,0)
yume.import_flag=false
end
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetDescription(aux.Stringid(id,0)) e1:SetDescription(aux.Stringid(id,0))
...@@ -20,10 +25,10 @@ function s.filter1tg(c) ...@@ -20,10 +25,10 @@ function s.filter1tg(c)
return c:IsFaceup() and aux.NegateAnyFilter(c) return c:IsFaceup() and aux.NegateAnyFilter(c)
end end
function s.filter1(c,e,tp) function s.filter1(c,e,tp)
return c:IsSetCard(0x715) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP) return c:IsSetCard(0x715) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEDOWN_DEFENSE)
end end
function s.filter1a(c) function s.filter1a(c)
return c:IsSetCard(0x715) and c:IsFaceup() return c:IsSetCard(0x715)
end end
function s.tg1(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function s.tg1(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
local c=e:GetHandler() local c=e:GetHandler()
...@@ -42,7 +47,7 @@ function s.op1(e,tp,eg,ep,ev,re,r,rp) ...@@ -42,7 +47,7 @@ function s.op1(e,tp,eg,ep,ev,re,r,rp)
local tc=Duel.GetFirstTarget() local tc=Duel.GetFirstTarget()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
local g=Duel.SelectMatchingCard(tp,s.filter1,tp,LOCATION_HAND,0,1,1,nil,e,tp) local g=Duel.SelectMatchingCard(tp,s.filter1,tp,LOCATION_HAND,0,1,1,nil,e,tp)
if #g>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)>0 and if #g>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEDOWN_DEFENSE)>0 and
tc:IsRelateToChain() and tc:IsFaceup() and tc:IsCanBeDisabledByEffect(e) then tc:IsRelateToChain() and tc:IsFaceup() and tc:IsCanBeDisabledByEffect(e) then
local c=e:GetHandler() local c=e:GetHandler()
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
...@@ -71,6 +76,8 @@ function s.op1(e,tp,eg,ep,ev,re,r,rp) ...@@ -71,6 +76,8 @@ function s.op1(e,tp,eg,ep,ev,re,r,rp)
Duel.BreakEffect() Duel.BreakEffect()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
local sg=dg:Select(tp,1,1,nil) local sg=dg:Select(tp,1,1,nil)
local cg=sg:Filter(Card.IsFacedown,nil)
Duel.ConfirmCards(1-tp,cg)
Duel.Destroy(sg,REASON_EFFECT) Duel.Destroy(sg,REASON_EFFECT)
end end
end 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