Commit d4ab7572 authored by POLYMER's avatar POLYMER

fix

parent cfa5c3ea
...@@ -4285,8 +4285,6 @@ ...@@ -4285,8 +4285,6 @@
11113127 0 11113127 0
11113131 0 11113131 0
15003025 0 15003025 0
27582600 0
27582601 0
31400076 0 31400076 0
31400077 0 31400077 0
31414002 0 31414002 0
...@@ -4730,7 +4728,6 @@ ...@@ -4730,7 +4728,6 @@
35301000 0 35301000 0
7409803 1 7409803 1
#211121 #211121
19000 0
65010089 0 65010089 0
65010096 0 65010096 0
65010097 0 65010097 0
...@@ -5896,34 +5893,6 @@ ...@@ -5896,34 +5893,6 @@
88880037 0 88880037 0
65130465 0 65130465 0
65130470 0 65130470 0
70007492 0
70007493 0
70007494 0
70007495 0
70007496 0
70007497 0
70007498 0
70007499 0
70007500 0
70007501 0
70007502 0
70007504 0
70007505 0
70007506 0
70007507 0
70007509 0
70007511 0
70007511 0
70007512 0
70007513 0
70007514 0
70007515 0
70007516 0
70007517 0
70007518 0
70007519 0
70007522 0
70007525 0
14010056 0 14010056 0
19198125 0 19198125 0
21030003 0 21030003 0
...@@ -5965,14 +5934,6 @@ ...@@ -5965,14 +5934,6 @@
67200823 0 67200823 0
67200825 0 67200825 0
67200827 0 67200827 0
70007559 0
70007560 0
70007561 0
70007562 0
70007563 0
70007564 0
70007565 0
70007567 0
22020810 0 22020810 0
22022090 0 22022090 0
22022770 0 22022770 0
...@@ -6242,38 +6203,6 @@ ...@@ -6242,38 +6203,6 @@
7485075 0 7485075 0
7485081 0 7485081 0
7485083 0 7485083 0
70002024 0
70002025 0
70002027 0
70002030 0
70002031 0
70002032 0
70002033 0
70002034 0
70002035 0
70002036 0
70002037 0
70002038 0
70002039 0
70002040 0
70002041 0
70002043 0
70002044 0
70002045 0
70002046 0
70002047 0
70002048 0
70002049 0
70002050 0
70002051 0
70002052 0
70002053 0
70002054 0
70002055 0
70002056 0
70002057 0
70002058 0
70002059 0
53799075 0 53799075 0
60000011 0 60000011 0
32500500 0 32500500 0
...@@ -6304,8 +6233,6 @@ ...@@ -6304,8 +6233,6 @@
32500546 0 32500546 0
121074344 0 121074344 0
33703034 0 33703034 0
70007666 0
70007678 0
4875102 0 4875102 0
4875111 0 4875111 0
4875218 0 4875218 0
...@@ -6328,34 +6255,6 @@ ...@@ -6328,34 +6255,6 @@
29415135 0 29415135 0
29415136 0 29415136 0
29415137 0 29415137 0
70002063 0
70002064 0
70002066 0
70002068 0
70002070 0
70002072 0
70002073 0
70002075 0
70002077 0
70002078 0
70002079 0
70002082 0
70002083 0
70002085 0
70002086 0
70002087 0
70002088 0
70002089 0
70002090 0
70002092 0
70002093 0
70002094 0
70002095 0
70002096 0
70002097 0
70002098 0
70002101 0
70002102 0
89390009 0 89390009 0
10150046 0 10150046 0
11634002 0 11634002 0
...@@ -6449,39 +6348,6 @@ ...@@ -6449,39 +6348,6 @@
88881026 0 88881026 0
98920359 0 98920359 0
15005459 0 15005459 0
70002103 0
70002104 0
70002105 0
70002106 0
70002108 0
70002110 0
70002113 0
70002115 0
70002116 0
70002117 0
70002118 0
70002120 0
70002121 0
70002123 0
70002124 0
70002125 0
70002126 0
70002127 0
70002128 0
70002129 0
70002130 0
70002131 0
70002132 0
70002133 0
70007741 0
70007743 0
70007745 0
70007748 0
70007751 0
70007754 0
70007755 0
70007756 0
70007757 0
98920615 0 98920615 0
40009673 0 40009673 0
40009675 0 40009675 0
...@@ -6623,13 +6489,6 @@ ...@@ -6623,13 +6489,6 @@
12856095 0 12856095 0
21185857 0 21185857 0
21185858 0 21185858 0
70002145 0
70002146 0
70002147 0
70002155 0
70002157 0
70002158 0
70002159 0
49811279 0 49811279 0
64800248 0 64800248 0
91300001 0 91300001 0
...@@ -6752,10 +6611,6 @@ ...@@ -6752,10 +6611,6 @@
7423643 0 7423643 0
11451026 0 11451026 0
12847444 0 12847444 0
70001018 0
70001019 0
70001020 0
70001021 0
91000101 0 91000101 0
91011010 0 91011010 0
91011012 0 91011012 0
...@@ -7032,8 +6887,6 @@ ...@@ -7032,8 +6887,6 @@
43990093 0 43990093 0
53796226 0 53796226 0
61000004 0 61000004 0
70001031 0
70001075 0
82224071 0 82224071 0
88881009 0 88881009 0
98920122 0 98920122 0
...@@ -7240,7 +7093,6 @@ ...@@ -7240,7 +7093,6 @@
10105561 1 10105561 1
11451651 1 11451651 1
10150026 2 10150026 2
19001 1
21185825 1 21185825 1
12855501 1 12855501 1
82209078 1 82209078 1
...@@ -7275,7 +7127,6 @@ ...@@ -7275,7 +7127,6 @@
40011531 1 40011531 1
88880225 1 88880225 1
22348451 1 22348451 1
70001026 0
11513056 1 11513056 1
11533716 1 11533716 1
19209556 2 19209556 2
......
No preview for this file type
No preview for this file type
...@@ -78,7 +78,7 @@ function c11513082.thop(e,tp,eg,ep,ev,re,r,rp) ...@@ -78,7 +78,7 @@ function c11513082.thop(e,tp,eg,ep,ev,re,r,rp)
local pc=Duel.GetFirstTarget() local pc=Duel.GetFirstTarget()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local tc=Duel.SelectMatchingCard(tp,c11513082.thfil,tp,LOCATION_DECK,0,1,1,nil):GetFirst() local tc=Duel.SelectMatchingCard(tp,c11513082.thfil,tp,LOCATION_DECK,0,1,1,nil):GetFirst()
if tc then if tc and pc:IsRelateToEffect(e) then
Duel.SendtoHand(tc,tp,REASON_EFFECT) Duel.SendtoHand(tc,tp,REASON_EFFECT)
Duel.ConfirmCards(1-tp,tc) Duel.ConfirmCards(1-tp,tc)
Duel.SendtoDeck(pc,nil,2,REASON_EFFECT) Duel.SendtoDeck(pc,nil,2,REASON_EFFECT)
......
...@@ -111,7 +111,7 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp) ...@@ -111,7 +111,7 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp)
end end
end end
function s.atkfilter(c) function s.atkfilter(c)
return cc:IsRace(RACE_INSECT) and c:IsAttribute(ATTRIBUTE_LIGHT) return c:IsRace(RACE_INSECT) and c:IsAttribute(ATTRIBUTE_LIGHT)
end end
function s.atkval(e,c) function s.atkval(e,c)
local ct=Duel.GetMatchingGroupCount(s.atkfilter,tp,LOCATION_GRAVE,0,nil) local ct=Duel.GetMatchingGroupCount(s.atkfilter,tp,LOCATION_GRAVE,0,nil)
......
...@@ -49,7 +49,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -49,7 +49,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(cm.tdcheck,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil,e,tp) end if chk==0 then return Duel.IsExistingMatchingCard(cm.tdcheck,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil,e,tp) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
local g=Duel.SelectMatchingCard(tp,cm.tdcheck,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil,e,tp,eg,ep,ev,re,r,rp,chk) local g=Duel.SelectMatchingCard(tp,cm.tdcheck,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,1,nil,e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SendtoDeck(g,nil,2,REASON_EFFECT) Duel.SendtoDeck(g,nil,2,REASON_COST)
local tc=g:GetFirst() local tc=g:GetFirst()
e:SetLabelObject(tc) e:SetLabelObject(tc)
end end
......
...@@ -49,7 +49,7 @@ function cm.initial_effect(c) ...@@ -49,7 +49,7 @@ function cm.initial_effect(c)
e3:SetType(EFFECT_TYPE_IGNITION) e3:SetType(EFFECT_TYPE_IGNITION)
e3:SetDescription(aux.Stringid(90700011,2)) e3:SetDescription(aux.Stringid(90700011,2))
e3:SetCondition(cm.con) e3:SetCondition(cm.con)
e3:SetTarget(cm.tg) e3:SetTarget(cm.rectg)
e3:SetLabel(1) e3:SetLabel(1)
e3:SetOperation(cm.op) e3:SetOperation(cm.op)
e3:SetRange(LOCATION_MZONE) e3:SetRange(LOCATION_MZONE)
......
...@@ -16,7 +16,7 @@ function c95101257.initial_effect(c) ...@@ -16,7 +16,7 @@ function c95101257.initial_effect(c)
c:RegisterEffect(e1) c:RegisterEffect(e1)
end end
function c95101257.poscon(e,tp,eg,ep,ev,re,r,rp) function c95101257.poscon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)==0 eg:IsExists(Card.IsSummonPlayer,1,nil,1-tp) return Duel.GetFieldGroupCount(tp,LOCATION_MZONE,0)==0 and eg:IsExists(Card.IsSummonPlayer,1,nil,1-tp)
end end
function c95101257.poscost(e,tp,eg,ep,ev,re,r,rp,chk) function c95101257.poscost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsDiscardable() end if chk==0 then return e:GetHandler():IsDiscardable() end
......
...@@ -909,6 +909,7 @@ ...@@ -909,6 +909,7 @@
!setname 0x5a7d 悬丝协律 !setname 0x5a7d 悬丝协律
!setname 0x6a7d 梦中 !setname 0x6a7d 梦中
!setname 0x9a7d 撒野 !setname 0x9a7d 撒野
!setname 0xaa7d 宇宙姬
!counter 0xa7d 女神指示物 !counter 0xa7d 女神指示物
!counter 0xa7f 好感指示物 !counter 0xa7f 好感指示物
...@@ -964,16 +965,7 @@ ...@@ -964,16 +965,7 @@
!setname 0x5880 幻影旅团 !setname 0x5880 幻影旅团
#永远的干涸 #永远的干涸
!setname 0x888 #Moved to Museum.
!setname 0x889 铭恶魔
!setname 0x890 铭魔王
!setname 0x1260 狂野
!setname 0x1262 遗言众
!setname 0x1267 魔龙
!setname 0x1272 羽仙
!setname 0x1273 白痕挑战者
!setname 0x1275 底片
!setname 0x1276 神域天使
#王某人 #王某人
!setname 0x980 隐匿之徒 !setname 0x980 隐匿之徒
...@@ -1474,7 +1466,7 @@ ...@@ -1474,7 +1466,7 @@
!setname 0x6f50 神座 !setname 0x6f50 神座
!setname 0x9f50 ·帕克· !setname 0x9f50 ·帕克·
!setname 0x3f51 ·雷姆· !setname 0x3f51 ·雷姆·
!setname 0x5f51 ·拉姆· !setname 0x5f51 终烬
!setname 0x6f51 ·加菲尔· !setname 0x6f51 ·加菲尔·
!setname 0x9f51 ·贝阿托莉丝· !setname 0x9f51 ·贝阿托莉丝·
!setname 0x3f52 救世小队 !setname 0x3f52 救世小队
......
This diff is collapsed.
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