Commit 60d1bd47 authored by POLYMER's avatar POLYMER

fix

parent d13c84e7
No preview for this file type
No preview for this file type
...@@ -93,12 +93,12 @@ function c11579814.ovgck(g) ...@@ -93,12 +93,12 @@ function c11579814.ovgck(g)
return g:IsExists(function(c) return c:IsLevel(2) or c:IsRank(2) or c:IsLink(2) end,1,nil) return g:IsExists(function(c) return c:IsLevel(2) or c:IsRank(2) or c:IsLink(2) end,1,nil)
end end
function c11579814.ovtg(e,tp,eg,ep,ev,re,r,rp,chk) function c11579814.ovtg(e,tp,eg,ep,ev,re,r,rp,chk)
local g=Duel.GetMatchingGroup(c11579814.ovfil,tp,LOCATION_MZONE+LOCATION_GRAVE,0,e:GetHandler()) local g=Duel.GetMatchingGroup(c11579814.ovfil,tp,LOCATION_MZONE+LOCATION_GRAVE,LOCATION_MZONE+LOCATION_GRAVE,e:GetHandler())
if chk==0 then return g:CheckSubGroup(c11579814.ovgck,2,2) end if chk==0 then return g:CheckSubGroup(c11579814.ovgck,2,2) end
end end
function c11579814.ovop(e,tp,eg,ep,ev,re,r,rp) function c11579814.ovop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
local g=Duel.GetMatchingGroup(c11579814.ovfil,tp,LOCATION_MZONE+LOCATION_GRAVE,0,e:GetHandler()) local g=Duel.GetMatchingGroup(c11579814.ovfil,tp,LOCATION_MZONE+LOCATION_GRAVE,LOCATION_MZONE+LOCATION_GRAVE,e:GetHandler())
if c:IsRelateToEffect(e) and g:CheckSubGroup(c11579814.ovgck,2,2) then if c:IsRelateToEffect(e) and g:CheckSubGroup(c11579814.ovgck,2,2) then
local og=g:SelectSubGroup(tp,c11579814.ovgck,false,2,2) local og=g:SelectSubGroup(tp,c11579814.ovgck,false,2,2)
Duel.Overlay(c,og) Duel.Overlay(c,og)
......
...@@ -107,7 +107,7 @@ function c118817732.spcost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -107,7 +107,7 @@ function c118817732.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST) e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
end end
function c118817732.spfilter(c,ft,e,tp) function c118817732.spfilter(c,ft,e,tp)
return c:IsSetCard(0xdd) and (c:IsAbleToHand() or (ft>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false))) return c:IsType(TYPE_MONSTER) and c:IsSetCard(0xdd) and (c:IsAbleToHand() or (ft>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false)))
end end
function c118817732.sptg(e,tp,eg,ep,ev,re,r,rp,chk) function c118817732.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then if chk==0 then
......
...@@ -59,7 +59,7 @@ function s.cfilter(c) ...@@ -59,7 +59,7 @@ function s.cfilter(c)
end end
function s.discon(e,tp,eg,ep,ev,re,r,rp) function s.discon(e,tp,eg,ep,ev,re,r,rp)
local ct=Duel.GetMatchingGroupCount(Card.IsFaceup,tp,LOCATION_MZONE,0,nil) local ct=Duel.GetMatchingGroupCount(Card.IsFaceup,tp,LOCATION_MZONE,0,nil)
if ct~=Duel.GetMatchingGroupCount(s.cfilter,tp,LOCATION_MZONE,0,nil) then return false end if ct~=Duel.GetMatchingGroupCount(s.cfilter,tp,LOCATION_MZONE,0,nil) or ct==0 then return false end
return rp==1-tp and Duel.IsChainNegatable(ev) and re:IsActiveType(TYPE_MONSTER) return rp==1-tp and Duel.IsChainNegatable(ev) and re:IsActiveType(TYPE_MONSTER)
end end
function s.distg(e,tp,eg,ep,ev,re,r,rp,chk) function s.distg(e,tp,eg,ep,ev,re,r,rp,chk)
......
...@@ -66,7 +66,7 @@ function s.cfilter(c) ...@@ -66,7 +66,7 @@ function s.cfilter(c)
end end
function s.discon(e,tp,eg,ep,ev,re,r,rp) function s.discon(e,tp,eg,ep,ev,re,r,rp)
local ct=Duel.GetMatchingGroupCount(Card.IsFaceup,tp,LOCATION_MZONE,0,nil) local ct=Duel.GetMatchingGroupCount(Card.IsFaceup,tp,LOCATION_MZONE,0,nil)
if ct~=Duel.GetMatchingGroupCount(s.cfilter,tp,LOCATION_MZONE,0,nil) then return false end if ct~=Duel.GetMatchingGroupCount(s.cfilter,tp,LOCATION_MZONE,0,nil) or ct==0 then return false end
return rp==1-tp and Duel.IsChainNegatable(ev) and re:IsHasType(EFFECT_TYPE_ACTIVATE) return rp==1-tp and Duel.IsChainNegatable(ev) and re:IsHasType(EFFECT_TYPE_ACTIVATE)
end end
function s.distg(e,tp,eg,ep,ev,re,r,rp,chk) function s.distg(e,tp,eg,ep,ev,re,r,rp,chk)
......
...@@ -65,8 +65,9 @@ function cm.sprop(e,tp,eg,ep,ev,re,r,rp,c) ...@@ -65,8 +65,9 @@ function cm.sprop(e,tp,eg,ep,ev,re,r,rp,c)
local g2=Duel.SelectMatchingCard(tp,cm.spr2filter,tp,LOCATION_MZONE,0,1,1,g1:GetFirst(),x,c) local g2=Duel.SelectMatchingCard(tp,cm.spr2filter,tp,LOCATION_MZONE,0,1,1,g1:GetFirst(),x,c)
g1:Merge(g2) g1:Merge(g2)
c:SetMaterial(g1) c:SetMaterial(g1)
e:SetType(EFFECT_TYPE_TRIGGER_O) e:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
Duel.SendtoGrave(g1,REASON_COST) Duel.SendtoGrave(g1,REASON_COST)
e:SetType(EFFECT_TYPE_FIELD)
Debug.Message("Her cries, call forth the storm.") Debug.Message("Her cries, call forth the storm.")
end end
function cm.distg(e,tp,eg,ep,ev,re,r,rp,chk,chkc) function cm.distg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
......
...@@ -67,10 +67,15 @@ function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -67,10 +67,15 @@ function cm.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK) Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
end end
function cm.thop(e,tp,eg,ep,ev,re,r,rp) function cm.thop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler()
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local g=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_DECK,0,1,1,nil) local tc=Duel.SelectMatchingCard(tp,cm.thfilter,tp,LOCATION_DECK,0,1,1,nil):GetFirst()
if g:GetCount()>0 then if tc and Duel.SendtoHand(tc,nil,REASON_EFFECT)>0 and tc:IsLocation(LOCATION_HAND) then
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.ConfirmCards(1-tp,tc)
Duel.ConfirmCards(1-tp,g) Duel.ShuffleHand(tp)
if c:IsRelateToEffect(e) and Duel.SelectYesNo(tp,aux.Stringid(m,2)) then
Duel.SendtoHand(c,nil,REASON_EFFECT)
Duel.ConfirmCards(1-tp,c)
end
end end
end end
...@@ -26,14 +26,14 @@ function cm.initial_effect(c) ...@@ -26,14 +26,14 @@ function cm.initial_effect(c)
e2:SetOperation(cm.damop) e2:SetOperation(cm.damop)
c:RegisterEffect(e2) c:RegisterEffect(e2)
end end
function cm.mifilter(c) function cm.milfilter(c)
return c:IsRace(RACE_WARRIOR) and c:IsLevelAbove(8) and c:IsAbleToHand() return c:IsRace(RACE_WARRIOR) and c:IsLevelAbove(8) and c:IsAbleToHand()
end end
function cm.activate(e,tp,eg,ep,ev,re,r,rp) function cm.activate(e,tp,eg,ep,ev,re,r,rp)
if Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)<3 then return end if Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)<3 then return end
local g=Duel.GetDecktopGroup(tp,3) local g=Duel.GetDecktopGroup(tp,3)
Duel.ConfirmCards(tp,g) Duel.ConfirmCards(tp,g)
if g:IsExists(cm.milfilter,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(m,0)) then if g:IsExists(cm.milfilter,1,nil,tp) and Duel.SelectYesNo(tp,aux.Stringid(m,0)) then
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
local sg=g:FilterSelect(tp,cm.milfilter,1,1,nil) local sg=g:FilterSelect(tp,cm.milfilter,1,1,nil)
Duel.SendtoHand(sg,nil,REASON_EFFECT) Duel.SendtoHand(sg,nil,REASON_EFFECT)
......
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