Commit bb19427f authored by POLYMER's avatar POLYMER

fix

parent caa03e8e
...@@ -356,10 +356,10 @@ function s.initial_effect(c) ...@@ -356,10 +356,10 @@ function s.initial_effect(c)
end end
return rz return rz
else else
return _SelectDisableField(tp,count,s,o,filter) return _SelectDisableField(tp,count,sl,ol,filter)
end end
end end
function Duel.SelectField(tp,count,sl,ol,filter) function Duel.SelectField(tp,count,sl,ol,filter,...)
if Duel.IsPlayerAffectedByEffect(0,id) then if Duel.IsPlayerAffectedByEffect(0,id) then
local zonet=0 local zonet=0
if sl&LOCATION_SZONE>0 then if sl&LOCATION_SZONE>0 then
...@@ -400,7 +400,7 @@ function s.initial_effect(c) ...@@ -400,7 +400,7 @@ function s.initial_effect(c)
Debug.Message(rz) Debug.Message(rz)
return rz return rz
else else
return _SelectField(tp,count,s,o,filter) return _SelectField(tp,count,sl,ol,filter,...)
end end
end end
local _AnnounceAttribute=Duel.AnnounceAttribute local _AnnounceAttribute=Duel.AnnounceAttribute
...@@ -544,7 +544,7 @@ function s.roll(min,max) ...@@ -544,7 +544,7 @@ function s.roll(min,max)
for i=0,10 do for i=0,10 do
result=result+(ct[g:RandomSelect(2,1):GetFirst()]<<(3*i)) result=result+(ct[g:RandomSelect(2,1):GetFirst()]<<(3*i))
end end
s.r=result&0xffffffff s.r=result&0xffffffff
end end
min=tonumber(min) min=tonumber(min)
max=tonumber(max) max=tonumber(max)
......
...@@ -12,7 +12,7 @@ function c79029803.initial_effect(c) ...@@ -12,7 +12,7 @@ function c79029803.initial_effect(c)
local e2=Effect.CreateEffect(c) local e2=Effect.CreateEffect(c)
e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O) e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
e2:SetCode(EVENT_TO_GRAVE) e2:SetCode(EVENT_TO_GRAVE)
e2:SetProperty(EFFECT_FLAG_DELAY) e2:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
e2:SetCountLimit(1,79029803) e2:SetCountLimit(1,79029803)
e2:SetCondition(c79029803.tgcon) e2:SetCondition(c79029803.tgcon)
e2:SetTarget(c79029803.detg) e2:SetTarget(c79029803.detg)
......
...@@ -45,8 +45,10 @@ end ...@@ -45,8 +45,10 @@ end
function c9911435.spcost1(e,tp,eg,ep,ev,re,r,rp,chk) function c9911435.spcost1(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,nil,9910871) end if chk==0 then return Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,nil,9910871) end
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM)
local tc=Duel.SelectMatchingCard(tp,Card.IsCode,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,1,nil,9910871):GetFirst() local g=Duel.SelectMatchingCard(tp,Card.IsCode,tp,LOCATION_HAND+LOCATION_ONFIELD,0,1,1,nil,9910871)
Duel.ConfirmCards(1-tp,tc) local tc=g:GetFirst()
if tc:IsFaceup() then Duel.HintSelection(g)
else Duel.ConfirmCards(1-tp,tc) end
end end
function c9911435.sptg1(e,tp,eg,ep,ev,re,r,rp,chk) function c9911435.sptg1(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
......
...@@ -50,9 +50,10 @@ function c9911619.conop(e,tp,eg,ep,ev,re,r,rp) ...@@ -50,9 +50,10 @@ function c9911619.conop(e,tp,eg,ep,ev,re,r,rp)
local g=Duel.GetFieldGroup(tp,LOCATION_HAND+LOCATION_ONFIELD,loc) local g=Duel.GetFieldGroup(tp,LOCATION_HAND+LOCATION_ONFIELD,loc)
if #g==0 then return end if #g==0 then return end
Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(9911619,0)) Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(9911619,0))
local tc=g:Select(tp,1,1,nil):GetFirst() local sg=g:Select(tp,1,1,nil)
Duel.ConfirmCards(tp,tc) local tc=sg:GetFirst()
Duel.ConfirmCards(1-tp,tc) if tc:IsFaceup() then Duel.HintSelection(sg)
else Duel.ConfirmCards(1-tc:GetControler(),tc) end
local code=tc:GetOriginalCode() local code=tc:GetOriginalCode()
if code==9911601 or code==9911614 then if code==9911601 or code==9911614 then
if Duel.SelectYesNo(tp,aux.Stringid(9911619,1)) then if Duel.SelectYesNo(tp,aux.Stringid(9911619,1)) then
......
...@@ -54,8 +54,8 @@ function c9911620.dsop(e,tp,eg,ep,ev,re,r,rp) ...@@ -54,8 +54,8 @@ function c9911620.dsop(e,tp,eg,ep,ev,re,r,rp)
Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(9911620,0)) Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(9911620,0))
local g1=g:SelectSubGroup(tp,c9911620.fselect,false,2,2,eg) local g1=g:SelectSubGroup(tp,c9911620.fselect,false,2,2,eg)
if not g1 or #g1~=2 then return end if not g1 or #g1~=2 then return end
Duel.ConfirmCards(tp,g1) if g1:IsExists(Card.IsFaceup,1,nil) then Duel.HintSelection(g1) end
Duel.ConfirmCards(1-tp,g1) if g1:IsExists(Card.IsFacedown,1,nil) then Duel.ConfirmCards(1-tp,g1) end
local lv1=g1:GetFirst():GetLevel() local lv1=g1:GetFirst():GetLevel()
local lv2=g1:GetNext():GetLevel() local lv2=g1:GetNext():GetLevel()
if lv1>lv2 then lv1,lv2=lv2,lv1 end if lv1>lv2 then lv1,lv2=lv2,lv1 end
......
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