Commit e73e41dc authored by POLYMER's avatar POLYMER

fix

parent 60d1bd47
...@@ -141,9 +141,7 @@ function c113652145.eqfilter(c,tc) ...@@ -141,9 +141,7 @@ function c113652145.eqfilter(c,tc)
end end
function c113652145.tgtg(e,tp,eg,ep,ev,re,r,rp,chk) function c113652145.tgtg(e,tp,eg,ep,ev,re,r,rp,chk)
if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and c113652145.tgfilter(chkc) end if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_MZONE) and c113652145.tgfilter(chkc) end
if chk==0 then return e:GetHandler():IsRelateToEffect(e) if chk==0 then return e:GetHandler():IsRelateToEffect(e) end
and Duel.IsExistingMatchingCard(c113652145.eqfilter,tp,LOCATION_DECK+LOCATION_EXTRA,0,1,nil,eg:GetFirst())
and Duel.GetLocationCount(tp,LOCATION_SZONE)>0 end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
Duel.SelectTarget(tp,c113652145.tgfilter,tp,LOCATION_MZONE,0,1,1,nil) Duel.SelectTarget(tp,c113652145.tgfilter,tp,LOCATION_MZONE,0,1,1,nil)
end end
...@@ -155,7 +153,10 @@ function c113652145.tgop(e,tp,eg,ep,ev,re,r,rp) ...@@ -155,7 +153,10 @@ function c113652145.tgop(e,tp,eg,ep,ev,re,r,rp)
if tc:IsFacedown() or not tc:IsRelateToEffect(e) or tc:GetEquipCount()>0 then return end if tc:IsFacedown() or not tc:IsRelateToEffect(e) or tc:GetEquipCount()>0 then return end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)
local sg=Duel.SelectMatchingCard(tp,c113652145.eqfilter,tp,LOCATION_DECK+LOCATION_EXTRA,0,1,1,nil,eg:GetFirst()) local sg=Duel.SelectMatchingCard(tp,c113652145.eqfilter,tp,LOCATION_DECK+LOCATION_EXTRA,0,1,1,nil,eg:GetFirst())
if sg:GetCount()==0 then return end if sg:GetCount()==0 then
Duel.ConfirmCards(1-tp,Duel.GetFieldGroup(tp,LOCATION_DECK+LOCATION_EXTRA,0))
return
end
local sc=sg:GetFirst() local sc=sg:GetFirst()
Duel.Equip(tp,sc,tc,true) Duel.Equip(tp,sc,tc,true)
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
...@@ -174,7 +175,7 @@ function c113652145.tgop(e,tp,eg,ep,ev,re,r,rp) ...@@ -174,7 +175,7 @@ function c113652145.tgop(e,tp,eg,ep,ev,re,r,rp)
sc:RegisterEffect(e2) sc:RegisterEffect(e2)
local e3=e2:Clone() local e3=e2:Clone()
e3:SetCode(EFFECT_CHANGE_TYPE) e3:SetCode(EFFECT_CHANGE_TYPE)
e3:SetValue(TYPE_XYZ) e3:SetValue(TYPE_XYZ+TYPE_MONSTER)
sc:RegisterEffect(e3) sc:RegisterEffect(e3)
local e4=Effect.CreateEffect(c) local e4=Effect.CreateEffect(c)
e4:SetCategory(CATEGORY_POSITION) e4:SetCategory(CATEGORY_POSITION)
......
...@@ -49,7 +49,7 @@ function s.posop(e,tp,eg,ep,ev,re,r,rp) ...@@ -49,7 +49,7 @@ function s.posop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_DECK,0,1,2,nil) local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_DECK,0,1,2,nil)
if g:GetCount()>0 then if g:GetCount()>0 then
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,tp,REASON_EFFECT)
Duel.ConfirmCards(1-tp,g) Duel.ConfirmCards(1-tp,g)
end end
end end
......
...@@ -11,7 +11,7 @@ function s.initial_effect(c) ...@@ -11,7 +11,7 @@ function s.initial_effect(c)
e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER) e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER)
e1:SetCountLimit(1,EFFECT_COUNT_CODE_CHAIN) e1:SetCountLimit(1,EFFECT_COUNT_CODE_CHAIN)
e1:SetRange(LOCATION_MZONE) e1:SetRange(LOCATION_MZONE)
e1:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DISABLE+CATEGORY_SPECIAL_SUMMON) e1:SetCategory(CATEGORY_DRAW)
e1:SetLabel(0) e1:SetLabel(0)
e1:SetCountLimit(1) e1:SetCountLimit(1)
e1:SetTarget(s.tg) e1:SetTarget(s.tg)
......
...@@ -4,7 +4,7 @@ Duel.LoadScript("c33201450.lua") ...@@ -4,7 +4,7 @@ Duel.LoadScript("c33201450.lua")
function s.initial_effect(c) function s.initial_effect(c)
--Activate --Activate
local e1=Effect.CreateEffect(c) local e1=Effect.CreateEffect(c)
e1:SetCategory(CATEGORY_TOHAND) e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetType(EFFECT_TYPE_ACTIVATE)
e1:SetCode(EVENT_FREE_CHAIN) e1:SetCode(EVENT_FREE_CHAIN)
e1:SetHintTiming(0,TIMING_END_PHASE+TIMING_EQUIP) e1:SetHintTiming(0,TIMING_END_PHASE+TIMING_EQUIP)
......
...@@ -616,6 +616,9 @@ ...@@ -616,6 +616,9 @@
!setname 0x37fb 零一 !setname 0x37fb 零一
!setname 0x47fb 亚克 !setname 0x47fb 亚克
#水镜
!setname 0xff7 式神
#紫宵 (PurpleNightfall) 114 0x970-0x97f #紫宵 (PurpleNightfall) 114 0x970-0x97f
!setname 0x6976 剑灵 !setname 0x6976 剑灵
!setname 0x9976 灵龙 !setname 0x9976 灵龙
......
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