Commit 07a3b35f authored by nanahira's avatar nanahira

Merge branch 'master' into beta

parents ade84bba eec2fef0
...@@ -124,7 +124,6 @@ cache: ...@@ -124,7 +124,6 @@ cache:
- lua-5.3.4.tar.gz - lua-5.3.4.tar.gz
- sqlite-amalgamation-3200100.zip - sqlite-amalgamation-3200100.zip
- irrKlang-32bit-1.5.0.zip - irrKlang-32bit-1.5.0.zip
- irrKlang-pro-1.5.0.zip
- sqlite-amalgamation-3150200.zip - sqlite-amalgamation-3150200.zip
- premake-5.0.0-alpha10-windows.zip - premake-5.0.0-alpha10-windows.zip
- Redis-x64-3.2.100.zip - Redis-x64-3.2.100.zip
......
...@@ -37,16 +37,12 @@ function cm.tdop(e,tp,eg,ep,ev,re,r,rp) ...@@ -37,16 +37,12 @@ function cm.tdop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)==0 then return end if Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)==0 then return end
local ct=1 local ct=1
if Card.IsHasEffect then local exte={c:IsHasEffect(37564427)}
local exte={c:IsHasEffect(37564427)} for _,te in ipairs(exte) do
for _,te in ipairs(exte) do if Duel.SelectEffectYesNo(tp,te:GetHandler()) then
if Duel.SelectEffectYesNo(tp,te:GetHandler()) then Duel.Hint(HINT_CARD,0,te:GetHandler():GetOriginalCode())
Duel.Hint(HINT_CARD,0,te:GetHandler():GetOriginalCode()) ct=ct+1
ct=ct+1
end
end end
else
ct=ct+c:GetEffectCount(37564427)
end end
Duel.ConfirmDecktop(tp,ct) Duel.ConfirmDecktop(tp,ct)
local ag=Duel.GetDecktopGroup(tp,ct) local ag=Duel.GetDecktopGroup(tp,ct)
......
This diff is collapsed.
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