Commit 8e83a379 authored by TanakaKotoha's avatar TanakaKotoha

fix

parent 130b49e7
Pipeline #542 passed with stages
in 42 minutes and 16 seconds
No preview for this file type
......@@ -206,6 +206,7 @@
12038003 1 --偶像P 普利兹姆
12040001 1 --发圈宠儿 梅雷特
12040002 1 --发圈宠儿 娜娜妮
12044001 0 --浦罗 向梦境起誓
12054001 0 --暴食女巫 顾拉
12054004 2 --海之家的霸者 顾拉
12056001 1 --星屑的茶会时间
......
expansions/pics/81011011.jpg

62.6 KB | W: | H:

expansions/pics/81011011.jpg

147 KB | W: | H:

expansions/pics/81011011.jpg
expansions/pics/81011011.jpg
expansions/pics/81011011.jpg
expansions/pics/81011011.jpg
  • 2-up
  • Swipe
  • Onion skin
......@@ -58,7 +58,7 @@ function cm.splimit(e,c)
return c:IsLocation(LOCATION_EXTRA)
end
function cm.thfilter(c)
return c:IsSetCard(0xfb5) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand() and c:IsFaceup()
return c:IsSetCard(0x8fb5) and c:IsType(TYPE_MONSTER) and c:IsAbleToHand() and c:IsFaceup()
end
function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(cm.thfilter,tp,LOCATION_DECK,0,1,nil) end
......
......@@ -28,13 +28,13 @@ function cm.initial_effect(c)
c:RegisterEffect(e2)
end
function cm.filter(c)
return c:IsSetCard(0xfb5) and c:IsAbleToHand()
return c:IsSetCard(0x8fb5) and c:IsAbleToHand()
end
function cm.filter1(c)
return c:IsSetCard(0xfb5) and c:IsAbleToHand() and c:IsFacedown()
return c:IsSetCard(0x8fb5) and c:IsAbleToHand() and c:IsFacedown()
end
function cm.filter2(c)
return c:IsSetCard(0xfb5) and c:IsAbleToHand() and c:IsFaceup()
return c:IsSetCard(0x8fb5) and c:IsAbleToHand() and c:IsFaceup()
end
function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler()
......
......@@ -56,7 +56,7 @@ function cm.costop(e,tp,eg,ep,ev,re,r,rp)
end
end
function cm.filter(c)
return c:IsAbleToHand() and c:IsSetCard(0xfb5)
return c:IsAbleToHand() and c:IsSetCard(0x8fb5)
end
function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_ONFIELD,0,1,nil) and e:GetHandler():IsAbleToDeck() and Duel.IsPlayerCanDraw(tp,1) end
......@@ -70,7 +70,7 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
Duel.SendtoDeck(c,tp,2,REASON_EFFECT)
c:ReverseInDeck()
Duel.ShuffleDeck(tp)
end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(tp,cm.filter,tp,LOCATION_ONFIELD,0,1,1,nil)
if g:GetCount()>0 then
......@@ -78,6 +78,7 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
Duel.ConfirmCards(1-tp,g)
Duel.Draw(tp,1,REASON_EFFECT)
end
end
end
function cm.checkop(e,tp,eg,ep,ev,re,r,rp)
if not ep then return end
......
......@@ -68,7 +68,7 @@ function cm.costop(e,tp,eg,ep,ev,re,r,rp)
end
end
function cm.chainfilter(re,tp,cid)
return not ( re:GetHandler():IsSetCard(0xfb5) and re:GetHandler():IsLocation(LOCATION_HAND) )
return not ( re:GetHandler():IsSetCard(0x8fb5) and re:GetHandler():IsLocation(LOCATION_HAND) )
end
function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
local c=e:GetHandler()
......
......@@ -68,9 +68,10 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) then
Duel.SendtoDeck(c,tp,2,REASON_EFFECT)
c:ReverseInDeck()
end
local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
Duel.Recover(p,d,REASON_EFFECT)
end
end
function cm.spcon(e,c)
if c==nil then return true end
......
......@@ -52,7 +52,7 @@ function cm.costop(e,tp,eg,ep,ev,re,r,rp)
end
end
function cm.filter(c)
return c:IsAbleToDeck() and c:IsSetCard(0xfb5)
return c:IsAbleToDeck() and c:IsSetCard(0x8fb5)
end
function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToDeck() and Duel.IsExistingMatchingCard(cm.filter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,nil) end
......@@ -64,7 +64,6 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
if c:IsRelateToEffect(e) then
Duel.SendtoDeck(c,tp,2,REASON_EFFECT)
c:ReverseInDeck()
end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
local g=Duel.SelectMatchingCard(tp,cm.filter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil)
Duel.SendtoDeck(g,nil,2,REASON_EFFECT)
......@@ -73,6 +72,7 @@ function cm.operation(e,tp,eg,ep,ev,re,r,rp)
end
Duel.ShuffleDeck(tp)
Duel.Draw(tp,1,REASON_EFFECT)
end
end
function cm.chainfilter(re,tp,cid)
return false
......
......@@ -79,7 +79,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
c:CancelToGrave(false)
end
function cm.cfilter(c)
return c:IsFaceup() and c:IsSetCard(0xfb5)
return c:IsFaceup() and c:IsSetCard(0x8fb5)
end
function cm.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(cm.cfilter,tp,LOCATION_MZONE,0,1,nil)
......
......@@ -72,7 +72,7 @@ function cm.filter(c)
return c:IsAbleToRemove()
end
function cm.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_MZONE,0,1,nil,0xfb5)
return Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_MZONE,0,1,nil,0x8fb5)
end
function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsControler(1-tp) and chkc:IsLocation(LOCATION_GRAVE) and cm.filter(chkc) end
......
......@@ -98,7 +98,7 @@ function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
c:CancelToGrave(false)
end
function cm.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_MZONE,0,1,nil,0xfb5)
return Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_MZONE,0,1,nil,0x8fb5)
end
function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsAbleToDeck() end
......
......@@ -73,7 +73,7 @@ function cm.filter(c,e,tp)
return c:IsCanBeSpecialSummoned(e,0,tp,false,false)
end
function cm.condition(e,tp,eg,ep,ev,re,r,rp)
return Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_MZONE,0,1,nil,0xfb5)
return Duel.IsExistingMatchingCard(Card.IsSetCard,tp,LOCATION_MZONE,0,1,nil,0x8fb5)
end
function cm.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
if chkc then return chkc:IsLocation(LOCATION_GRAVE) and cm.filter(chkc,e,tp) end
......
......@@ -47,7 +47,7 @@ function cm.seop(code,op)
end
end
function rsch.SummonEffect2(c,code,cate,flag,tg,op)
local e1=rsef.STO(c,EVENT_SUMMON_SUCCESS,{code,0},nil,cate,flag,cm.secon,nil,tg,op)
local e1=rsef.STF(c,EVENT_SUMMON_SUCCESS,{code,0},nil,cate,flag,cm.secon,nil,tg,op)
return e1
end
function rsch.LimitFun(c,code)
......
......@@ -165,7 +165,7 @@
!setname 0x6fb2 蛋黄兔姬
!setname 0x1fb3 波恋达斯
!setname 0x2fb3 双色
!setname 0xfb5 异界支配者
!setname 0x8fb5 异界支配者
!setname 0xfb6 火枪手
!setname 0x3fb7 事龙人
!setname 0xfb8 水歌
......
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