Commit 182bfdc2 authored by Huangnan's avatar Huangnan

update2

parent ed222a1f
Pipeline #38651 passed with stage
in 2 minutes and 2 seconds
#created by ...
#main
10230080
10230100
11901360
11902220
12801805
12801810
12801815
12801820
12801835
12801840
16101259
16101260
16105300
16107100
16107101
16107102
16107103
16107104
16107105
16107109
16107110
16107111
16107112
16107113
16107114
16107117
16107121
16107122
16107123
16107124
16400830
16400835
16400840
16400845
16400850
16400855
16400860
16400865
16401520
17243575
17243581
17243636
17243742
17243744
#extra
10230110
11901520
12801825
12801830
12816140
16104216
16107106
16107107
16107108
16107115
16107116
16107118
16107119
16107120
16401435
!side
16401440
16401445
16401450
16401455
16401460
16401465
16401470
16401475
16401480
16401515
17243583
17243597
17243605
17243632
17243638
#created by ...
#main
18700235
18700339
18700344
18700349
18700361
18701087
18701093
18701096
18701099
18701102
22600500
31710044
31710120
31710150
31710155
31710160
31710210
31750133
31750169
33200038
33500090
33500092
33503630
33503640
33720380
33720381
33720382
33720387
33720388
33720389
33720390
33720391
33720392
33720393
33720394
33720395
33720396
33720397
33720398
33720399
33730999
36700480
36700484
36700488
#extra
33503621
33503622
33503626
33503627
33720383
33720384
33720385
33720386
36700504
36700508
36700512
36700516
36700520
36700522
36700524
!side
36700492
36700496
36700500
36700526
36700528
36700530
36700532
36700534
36700536
36700538
36700540
36700542
36700544
36700546
36700548
#created by ...
#main
47320301
47320302
47320303
47320304
47320305
47320306
47320307
47320308
47320309
47320310
47320311
47320312
47320313
47320314
47320315
47320316
47320351
47320352
47320353
47320354
47320355
47320356
47320359
47320360
47320361
47320362
47320363
47320364
47320367
60000094
60000095
60000096
60000097
60001500
60001501
60001502
60001503
60001504
60001505
60001506
60001507
60001508
60001509
60001510
#extra
47320317
47320357
47320358
47320365
47320366
50225015
50225016
52798060
62624310
62624320
62624570
62625145
62699335
62699340
62699345
!side
60001511
60001512
60001513
60001514
60001515
60001516
60001517
60001518
60001519
60001520
60001521
60001522
60001523
60001524
60001525
#created by ...
#main
62624230
62624235
62624580
62699300
62699305
62699310
62699315
62699320
62699325
62699330
62699365
62699370
62699375
62699380
62699385
62699390
62699395
62699410
65700005
65700140
65810000
65810005
65810010
65810015
65810020
65810025
65810040
65810045
65810050
65810055
65899910
65899915
71200800
71200802
71200804
71200806
71200808
71200812
71200814
71200816
75000001
75000002
75000009
75000010
#extra
62699350
62699355
62699360
65700125
65700170
65810030
65810035
65899935
71200810
75000003
75000006
75000007
75000032
75000037
75000051
!side
75000011
75000014
75000017
75000018
75000019
75000020
75000023
75000025
75000028
75000030
75000034
75000053
75000057
75000060
75000061
#created by ...
#main
10230080
16107111
16107121
16107122
17243744
17243746
17243750
18029609
18029611
18029612
18029613
18031001
18031002
18031010
18031014
18031111
31710044
31710120
31710150
31710155
31710160
47320304
47320309
47320310
47320315
47320352
50221210
65700140
75081031
75081040
75640150
75640151
75640157
79101710
79101720
79101730
79101760
87498469
87498636
93311205
93311210
93311220
#extra
12816140
16107118
17243605
17243632
18700205
18700225
18700228
18701090
31710190
33503626
47320357
65810035
87498471
93311235
!side
#created by ...
#main
1300910
5012615
5012620
5012627
5012630
5012641
5012729
11600036
11600126
11600131
11600133
11600136
11600137
11600140
11600141
11600142
11600145
11600196
11600234
12400065
12400138
12400140
12866600
12866610
12866611
12866655
12866700
12866755
12866756
12866885
12882000
12882005
12882010
12882040
12882045
13700033
13700043
16107122
16110014
16114265
16114268
16130002
16130006
16130008
#extra
5012628
5012634
5012640
11600128
12816140
12866890
13700027
13700029
13700031
13700314
13700316
16130001
16130003
16130004
16130005
!side
16130007
16130009
16130010
16130011
16130012
16130013
16130014
16140000
16140001
16140002
16140003
16140018
16149584
16149586
16348005
#created by ... #created by ...
#main #main
17243746 16348007
17243748 16348009
17243750 16364303
17243756 16364350
18029601 16400870
18029602 16400875
18029603 16400880
18029604 16400885
18029605 16400890
18029606 16401525
18029607 16401530
18029608 16401540
18029609 16401545
18029610 16401565
18029611 16401570
18029612 16401575
18029613 16401580
18029614 18019002
18029615 18019004
18029616 18019051
18029617
18029618
18031001 18031001
18031002 18031002
18031003 18031003
...@@ -43,38 +41,40 @@ ...@@ -43,38 +41,40 @@
18031019 18031019
18031020 18031020
18031021 18031021
18031101 18700092
18700545
18701108
#extra #extra
17243740 16368160
18700205 16368180
18700225 16401240
18700228 16401535
18700354 16401536
18701084 16401550
18701090 16401555
18701105 16401560
31710112 33201408
31710190 36700504
33200656 36700508
33200658 36700512
33200660 36700516
33200662 36700520
33200664 36700522
!side !side
18031102 22600400
18031103 31710044
18031104 33201401
18031105 36700480
18031106 36700484
18031107 36700488
18031108 36700492
18031109 36700496
18031110 36700500
18031111 36700524
18031112 36700526
18031113 36700528
18031114 36700530
18700222 36700532
18700232 36700534
#created by ...
#main
36700536
36700538
36700540
36700542
36700544
36700550
36700552
36700554
36700556
36700558
36700560
60000228
60000229
60000230
60000231
60000232
60000233
60000234
60000236
60000240
60000241
60000242
60000243
60000245
60000246
60001511
60001526
60001528
60001529
60001530
60001532
60001533
60001535
60001536
60001537
60001538
60001540
60001541
60001542
60001543
60001544
60001545
60001546
60001547
#extra
36700546
36700548
60000235
60000237
60000238
60000239
60000244
60001527
60001531
60001534
60001539
60001557
60007190
62699425
65700070
!side
60001548
60001549
60001550
60001551
60001552
60001553
60001554
62699410
62699415
62699420
65700075
65700140
65812000
65812005
65812010
#created by ... #created by ...
#main #main
75000099 65812015
75000831 65812020
65812025
65812030
65812040
65812045
65812050
65812055
65899900
65899905
65899915
65899930
75081031 75081031
75081032 75081032
75081033 75081033
75081034 75081034
75081035 75081035
75081036 75081036
75081037
75081038 75081038
75081039 75081039
75081040 75081040
...@@ -21,51 +30,51 @@ ...@@ -21,51 +30,51 @@
75081048 75081048
75081049 75081049
75081051 75081051
79101710 79100260
79101720 79103000
79101730 79103040
79101760 79103050
87498636 79103060
93050042 79103070
93050120 79103080
93050121 79103090
93050122 79103100
93050123 79103110
93050124 79103120
93050125 79103130
93050126 79103140
93050127 79103150
93050128
93311205
93311210
93311215
93311220
93311240
93311245
93311250
95102001
#extra #extra
75000064 65812035
75000067 79103010
79101740 79103020
79101750 79103030
87498471 79110260
93311225 87452568
93311230 93050041
93311235 93050043
95102000 93050104
95102006 95101043
95102007 95101045
95101047
95101049
95101066
95101068
!side !side
95102002 79103160
95102003 79103170
95102004 93050040
95102005 93050042
95102008 93050100
95102009 93050101
95102010 93050102
95102011 93050103
95102017 93050105
95102018 93050106
93050107
93050108
93050120
93050121
93050122
#created by ...
#main
93050123
93050124
93050125
93050126
93050127
93050128
95101000
95101001
95101002
95101004
95101006
95101008
95101010
95101012
95101014
95101016
95101018
95101020
95101022
95101024
95101026
95101028
95101030
95101031
95101032
95101033
95101034
95101035
95101037
95101039
95101041
95101051
95101053
95101055
95101056
95101057
95101058
95101060
95101062
95101064
#extra
!side
#created by ...
#main
1300910
5012729
11600036
11600126
11600131
11600133
11600136
11600140
11600142
11600196
12400065
12866700
12866885
12869005
12882040
12882045
13700043
16104426
16107122
16110001
16110050
16114200
16401540
18031001
18031002
18031010
18031014
18700042
18700249
18700324
31710044
31710150
47310510
47320304
47320310
47320352
60000234
60000236
60000240
60000242
60001528
60001536
60001544
60001546
#extra
5012640
11600128
12400099
12823200
12866890
13700031
16103026
16368160
18700208
47320357
60000238
79100310
79103030
79110260
87452568
!side
62699415
65812000
65812015
65812020
65812030
65812055
65899915
65899930
75640157
77707703
79100260
79100270
79100280
79103040
79103170
#created by ...
#main
81010042
95101000
95101002
95101004
95101006
95101018
95101020
95101024
95101026
95101032
95101034
95101058
#extra
93050043
95101049
!side
No preview for this file type
This diff is collapsed.
...@@ -43,7 +43,7 @@ function s.tftg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -43,7 +43,7 @@ function s.tftg(e,tp,eg,ep,ev,re,r,rp,chk)
end end
function s.tfop(e,tp,eg,ep,ev,re,r,rp) function s.tfop(e,tp,eg,ep,ev,re,r,rp)
local g1=Group.CreateGroup() local g1=Group.CreateGroup()
if Duel.GetLocationCount(tp,LOCATION_SZONE)>=0 then g1=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.tffilter),tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil,tp) end if Duel.GetLocationCount(tp,LOCATION_SZONE)>0 then g1=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.tffilter),tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil,tp) end
g1:Merge(Duel.GetMatchingGroup(aux.NecroValleyFilter(s.tffilter1),tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil,tp)) g1:Merge(Duel.GetMatchingGroup(aux.NecroValleyFilter(s.tffilter1),tp,LOCATION_HAND+LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil,tp))
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
local tc=g1:Select(tp,1,1,nil):GetFirst() local tc=g1:Select(tp,1,1,nil):GetFirst()
......
...@@ -58,7 +58,7 @@ function s.shfilter(c) ...@@ -58,7 +58,7 @@ function s.shfilter(c)
return c:GetFlagEffect(65812010)>0 return c:GetFlagEffect(65812010)>0
end end
function s.tffilter(c,e,tp) function s.tffilter(c,e,tp)
return c:IsFaceupEx() and (c:IsLocation(LOCATION_HAND+LOCATION_ONFIELD) or c:IsLocation(LOCATION_DECK) and Duel.IsExistingMatchingCard(s.shfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil,e,tp) and Duel.GetFlagEffect(tp,id)==0) and (aux.IsCodeListed(c,65812000) or c:IsCode(65812000)) and Duel.GetMZoneCount(tp,c)>0 return c:IsFaceupEx() and (c:IsLocation(LOCATION_HAND+LOCATION_ONFIELD) or (c:IsLocation(LOCATION_DECK) and Duel.IsExistingMatchingCard(s.shfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil,e,tp) and (aux.IsCodeListed(c,65812000) or c:IsCode(65812000)) and Duel.GetFlagEffect(tp,id)==0)) and Duel.GetMZoneCount(tp,c)>0
end end
function s.tftg(e,tp,eg,ep,ev,re,r,rp,chk) function s.tftg(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler() local c=e:GetHandler()
......
...@@ -39,7 +39,7 @@ function s.initial_effect(c) ...@@ -39,7 +39,7 @@ function s.initial_effect(c)
e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e4:SetCode(EVENT_CHAIN_SOLVING) e4:SetCode(EVENT_CHAIN_SOLVING)
e4:SetRange(LOCATION_MZONE) e4:SetRange(LOCATION_MZONE)
e4:SetCondition(s.negcon) e4:SetTarget(s.actarget)
e4:SetOperation(s.negop) e4:SetOperation(s.negop)
c:RegisterEffect(e4) c:RegisterEffect(e4)
end end
...@@ -125,7 +125,7 @@ function s.cfilter1(c,e) ...@@ -125,7 +125,7 @@ function s.cfilter1(c,e)
if seq>4 or c:IsLocation(LOCATION_PZONE) then return false end if seq>4 or c:IsLocation(LOCATION_PZONE) then return false end
return (c:IsLocation(LOCATION_MZONE) and ((seq>0 and Duel.CheckLocation(tp,LOCATION_MZONE,seq-1)) or (seq<4 and Duel.CheckLocation(tp,LOCATION_MZONE,seq+1))) or c:IsLocation(LOCATION_SZONE) and ((seq>0 and Duel.CheckLocation(tp,LOCATION_SZONE,seq-1)) or (seq<4 and Duel.CheckLocation(tp,LOCATION_SZONE,seq+1)))) and not c:IsImmuneToEffect(e) return (c:IsLocation(LOCATION_MZONE) and ((seq>0 and Duel.CheckLocation(tp,LOCATION_MZONE,seq-1)) or (seq<4 and Duel.CheckLocation(tp,LOCATION_MZONE,seq+1))) or c:IsLocation(LOCATION_SZONE) and ((seq>0 and Duel.CheckLocation(tp,LOCATION_SZONE,seq-1)) or (seq<4 and Duel.CheckLocation(tp,LOCATION_SZONE,seq+1)))) and not c:IsImmuneToEffect(e)
end end
function s.negcon(e,tp,eg,ep,ev,re,r,rp) function s.actarget(e,te)
local c=e:GetHandler() local c=e:GetHandler()
local tc=Duel.GetChainInfo(0,CHAININFO_TRIGGERING_EFFECT):GetHandler() local tc=Duel.GetChainInfo(0,CHAININFO_TRIGGERING_EFFECT):GetHandler()
local g=c:GetColumnGroup():Filter(s.cfilter1,nil,e) local g=c:GetColumnGroup():Filter(s.cfilter1,nil,e)
......
--陶片放逐法
local s,id,o=GetID()
function s.initial_effect(c)
--Activate
local e1=Effect.CreateEffect(c)
e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN)
e1:SetCondition(s.condition)
e1:SetCountLimit(1,id+EFFECT_COUNT_CODE_OATH)
c:RegisterEffect(e1)
--win
local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_DELAY)
e2:SetCode(EVENT_ADJUST)
e2:SetRange(LOCATION_SZONE)
e2:SetCondition(s.condition2)
e2:SetOperation(s.operation2)
c:RegisterEffect(e2)
local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
e3:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_DELAY)
e3:SetCode(EVENT_ADJUST)
e3:SetRange(LOCATION_SZONE)
e3:SetCondition(s.condition3)
e3:SetOperation(s.operation3)
c:RegisterEffect(e3)
end
function s.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)==0
end
function s.condition2(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
local g1=Duel.GetMatchingGroupCount(nil,tp,LOCATION_MZONE,0,nil)
local g2=Duel.GetMatchingGroupCount(nil,tp,0,LOCATION_MZONE,nil)
return g1-g2>=7
end
function s.operation2(e,tp,eg,ep,ev,re,r,rp)
local WIN_REASON_TRUE_EXODIA = 0x3a30
Duel.Win(tp,WIN_REASON_TRUE_EXODIA)
if Duel.GetCurrentChain()==0 then Duel.Readjust() end
end
function s.condition3(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
local g1=Duel.GetMatchingGroupCount(nil,tp,LOCATION_MZONE,0,nil)
local g2=Duel.GetMatchingGroupCount(nil,tp,0,LOCATION_MZONE,nil)
return g2-g1>=7
end
function s.operation3(e,tp,eg,ep,ev,re,r,rp)
local WIN_REASON_TRUE_EXODIA = 0x3a30
Duel.Win(1-tp,WIN_REASON_TRUE_EXODIA)
if Duel.GetCurrentChain()==0 then Duel.Readjust() end
end
\ No newline at end of file
...@@ -207,6 +207,7 @@ ...@@ -207,6 +207,7 @@
!setname 0x546 纳塔 !setname 0x546 纳塔
!setname 0x547 HY !setname 0x547 HY
!setname 0x3547 CHY !setname 0x3547 CHY
!setname 0x6540 构造体
!counter 0x1545 深渊指示物 !counter 0x1545 深渊指示物
!counter 0x1540 蕴种印指示物 !counter 0x1540 蕴种印指示物
!counter 0x540 契约指示物 !counter 0x540 契约指示物
...@@ -419,7 +420,7 @@ ...@@ -419,7 +420,7 @@
!setname 0x6ce1 Servant !setname 0x6ce1 Servant
!setname 0xce9 光之战士 !setname 0xce9 光之战士
!setname 0x9ce1 血寂 !setname 0x9ce1 血寂
!setname 0xace1 天文开关 !setname 0x3ce2 永恒之地
!setname 0xcce1 暗之终焉 !setname 0xcce1 暗之终焉
!counter 0xce1 救世之旅指示物 !counter 0xce1 救世之旅指示物
...@@ -1259,7 +1260,7 @@ ...@@ -1259,7 +1260,7 @@
!setname 0x562e 圣兽装骑·鲨 !setname 0x562e 圣兽装骑·鲨
!setname 0x662e 圣兽装骑·蜂 !setname 0x662e 圣兽装骑·蜂
!setname 0x962e 圣兽装骑·骸 !setname 0x962e 圣兽装骑·骸
!setname 0x3624 罗塔
#AddCodeList(60001179) 紫罗兰永恒花园卡名记述 #AddCodeList(60001179) 紫罗兰永恒花园卡名记述
!counter 0x624 进化指示物 !counter 0x624 进化指示物
!counter 0x625 吟唱指示物 !counter 0x625 吟唱指示物
...@@ -1548,7 +1549,7 @@ ...@@ -1548,7 +1549,7 @@
!counter 0x1731 灵蔓指示物 !counter 0x1731 灵蔓指示物
!counter 0x1732动感贴纸指示物 !counter 0x1732动感贴纸指示物
#TT - 750 0x750-0x75f #神威子/tt 1187588788 750 0x750-0x75f
!setname 0x5751 苍炎之轨迹 !setname 0x5751 苍炎之轨迹
!setname 0xa751 烈刃 !setname 0xa751 烈刃
!setname 0x3755 焰刃之琳 !setname 0x3755 焰刃之琳
...@@ -1568,6 +1569,7 @@ ...@@ -1568,6 +1569,7 @@
!setname 0x9752 回响 !setname 0x9752 回响
!setname 0xa754 黑之牙 !setname 0xa754 黑之牙
!counter 0x754 埃吉尔指示物 !counter 0x754 埃吉尔指示物
!counter 0x754 埃吉尔指示物
#天生 756460095 756 0x2c0-0x2cf #天生 756460095 756 0x2c0-0x2cf
!setname 0x2c0 崩坏 !setname 0x2c0 崩坏
...@@ -1622,6 +1624,11 @@ ...@@ -1622,6 +1624,11 @@
!setname 0x5a12 无尽位面 !setname 0x5a12 无尽位面
!setname 0x6a12 争霸赛 !setname 0x6a12 争霸赛
!setname 0x9a12 迷途罪械 !setname 0x9a12 迷途罪械
!setname 0xa13 星舰
!setname 0x3a13 星舰战略
!setname 0x5a13 星舰组件
!counter 0xa12 天魂指示物
!counter 0xa11 决战指示物
#yee 1138772630 792 0x5c0-0x5cf #yee 1138772630 792 0x5c0-0x5cf
!setname 0x5c0 星钢 !setname 0x5c0 星钢
...@@ -1771,8 +1778,9 @@ ...@@ -1771,8 +1778,9 @@
#希腊奶 2471008380 933 0xfc0-0xfcf #希腊奶 2471008380 933 0xfc0-0xfcf
!setname 0xfc6 侵晨 !setname 0xfc6 侵晨
#陀螺 3161407259 930 0xaf0-0xaff #TL 3161407259 930 0xcf0-0xcff
!setname 0xaf1 寄生兽 !setname 0xcf1 寄生兽
!setname 0x3cf4 邪魔
!setname 0xaf2 镜世界 !setname 0xaf2 镜世界
!setname 0x3af2 镜世界魔神 !setname 0x3af2 镜世界魔神
!setname 0xaf3 圣庭 !setname 0xaf3 圣庭
...@@ -1802,6 +1810,9 @@ ...@@ -1802,6 +1810,9 @@
#帽子米 2504387843 951 0xbb0-0xbbf #帽子米 2504387843 951 0xbb0-0xbbf
!setname 0xbbc 馄饨剩汤 !setname 0xbbc 馄饨剩汤
!setname 0xbbb 黑之裁判
!setname 0xbba 魔姬
#AddCodeList(95101001) 不死人 格林记述
#奇跡の早苗 2060043514 961 0x7e0-0x7ef #奇跡の早苗 2060043514 961 0x7e0-0x7ef
!setname 0x37e0 苍蓝奇迹 !setname 0x37e0 苍蓝奇迹
......
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