Skip to content

Y
ygopro
Commit d6f92cb9 authored by VanillaSalt's avatar VanillaSalt
Browse files
Options

fix

parent ec236112
Hide whitespace changes
Inline Side-by-side
Showing with 117 additions and 56 deletions
script/c12071500.lua
View file @ d6f92cb9
......@@ -68,11 +68,18 @@ function c12071500.activate(e,tp,eg,ep,ev,re,r,rp)
fop(ce,e,tp,tc,mat2,SUMMON_TYPE_FUSION+0x10)
end
tc:CompleteProcedure()
elseif Duel.IsPlayerCanSpecialSummon(tp) then
else
local cg1=Duel.GetFieldGroup(tp,LOCATION_HAND,0)
Duel.ConfirmCards(1-tp,cg1)
local cg2=Duel.GetFieldGroup(tp,LOCATION_EXTRA,0)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
local ct=cg1:GetCount()
if not Duel.IsPlayerAffectedByEffect(tp,30459350) then
ct=ct+Duel.GetMatchingGroupCount(Card.IsType,tp,LOCATION_GRAVE,0,nil,TYPE_MONSTER)
end
if ct>1 and cg2:IsExists(Card.IsFacedown,1,nil)
and Duel.IsPlayerCanSpecialSummon(tp) and not Duel.IsPlayerAffectedByEffect(tp,27581098) then
Duel.ConfirmCards(1-tp,cg1)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
end
end
end
script/c1264319.lua
View file @ d6f92cb9
......@@ -75,12 +75,15 @@ function c1264319.activate(e,tp,eg,ep,ev,re,r,rp)
fop(ce,e,tp,tc,mat2)
end
tc:CompleteProcedure()
elseif Duel.IsPlayerCanSpecialSummon(tp) then
else
local cg1=Duel.GetFieldGroup(tp,LOCATION_HAND+LOCATION_MZONE,0)
Duel.ConfirmCards(1-tp,cg1)
local cg2=Duel.GetFieldGroup(tp,LOCATION_EXTRA,0)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
if cg1:GetCount()>1 and cg2:IsExists(Card.IsFacedown,1,nil)
and Duel.IsPlayerCanSpecialSummon(tp) and not Duel.IsPlayerAffectedByEffect(tp,27581098) then
Duel.ConfirmCards(1-tp,cg1)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
end
end
end
function c1264319.thfilter(c)
......
script/c23299957.lua
View file @ d6f92cb9
......@@ -82,11 +82,14 @@ function c23299957.activate(e,tp,eg,ep,ev,re,r,rp)
e3:SetCode(EFFECT_CANNOT_DISEFFECT)
e3:SetReset(RESET_EVENT+0x1fe0000)
tc:RegisterEffect(e3,true)
elseif Duel.IsPlayerCanSpecialSummon(tp) then
else
local cg1=Duel.GetFieldGroup(tp,LOCATION_HAND+LOCATION_MZONE,0)
Duel.ConfirmCards(1-tp,cg1)
local cg2=Duel.GetFieldGroup(tp,LOCATION_EXTRA,0)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
if cg1:GetCount()>1 and cg2:IsExists(Card.IsFacedown,1,nil)
and Duel.IsPlayerCanSpecialSummon(tp) and not Duel.IsPlayerAffectedByEffect(tp,27581098) then
Duel.ConfirmCards(1-tp,cg1)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
end
end
end
script/c24094653.lua
View file @ d6f92cb9
......@@ -65,11 +65,14 @@ function c24094653.activate(e,tp,eg,ep,ev,re,r,rp)
fop(ce,e,tp,tc,mat2)
end
tc:CompleteProcedure()
elseif Duel.IsPlayerCanSpecialSummon(tp) then
else
local cg1=Duel.GetFieldGroup(tp,LOCATION_HAND+LOCATION_MZONE,0)
Duel.ConfirmCards(1-tp,cg1)
local cg2=Duel.GetFieldGroup(tp,LOCATION_EXTRA,0)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
if cg1:GetCount()>1 and cg2:IsExists(Card.IsFacedown,1,nil)
and Duel.IsPlayerCanSpecialSummon(tp) and not Duel.IsPlayerAffectedByEffect(tp,27581098) then
Duel.ConfirmCards(1-tp,cg1)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
end
end
end
script/c27581098.lua
View file @ d6f92cb9
......@@ -15,6 +15,14 @@ function c27581098.initial_effect(c)
e2:SetTargetRange(1,1)
e2:SetTarget(c27581098.splimit)
c:RegisterEffect(e2)
--
local e3=Effect.CreateEffect(c)
e3:SetType(EFFECT_TYPE_FIELD)
e3:SetRange(LOCATION_SZONE)
e3:SetCode(27581098)
e3:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
e3:SetTargetRange(1,1)
c:RegisterEffect(e3)
end
function c27581098.splimit(e,c,tp,sumtp,sumpos)
return bit.band(sumtp,SUMMON_TYPE_FUSION)==SUMMON_TYPE_FUSION
......
script/c33550694.lua
View file @ d6f92cb9
......@@ -76,11 +76,14 @@ function c33550694.operation(e,tp,eg,ep,ev,re,r,rp)
fop(ce,e,tp,tc,mat2)
end
tc:CompleteProcedure()
elseif Duel.IsPlayerCanSpecialSummon(tp) then
else
local cg1=Duel.GetFieldGroup(tp,LOCATION_HAND+LOCATION_MZONE,0)
Duel.ConfirmCards(1-tp,cg1)
local cg2=Duel.GetFieldGroup(tp,LOCATION_EXTRA,0)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
if cg1:GetCount()>1 and cg2:IsExists(Card.IsFacedown,1,nil)
and Duel.IsPlayerCanSpecialSummon(tp) and not Duel.IsPlayerAffectedByEffect(tp,27581098) then
Duel.ConfirmCards(1-tp,cg1)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
end
end
end
script/c37630732.lua
View file @ d6f92cb9
......@@ -79,12 +79,15 @@ function c37630732.activate(e,tp,eg,ep,ev,re,r,rp)
e2:SetReset(RESET_PHASE+PHASE_END)
e2:SetOperation(c37630732.damop)
Duel.RegisterEffect(e2,tp)
elseif Duel.IsPlayerCanSpecialSummon(tp) then
else
local cg1=Duel.GetFieldGroup(tp,LOCATION_HAND+LOCATION_MZONE,0)
Duel.ConfirmCards(1-tp,cg1)
local cg2=Duel.GetFieldGroup(tp,LOCATION_EXTRA,0)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
if cg1:GetCount()>1 and cg2:IsExists(Card.IsFacedown,1,nil)
and Duel.IsPlayerCanSpecialSummon(tp) and not Duel.IsPlayerAffectedByEffect(tp,27581098) then
Duel.ConfirmCards(1-tp,cg1)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
end
end
end
function c37630732.damop(e,tp,eg,ep,ev,re,r,rp)
......
script/c43698897.lua
View file @ d6f92cb9
......@@ -93,12 +93,15 @@ function c43698897.spop(e,tp,eg,ep,ev,re,r,rp)
fop(ce,e,tp,tc,mat2)
end
tc:CompleteProcedure()
elseif Duel.IsPlayerCanSpecialSummon(tp) then
else
local cg1=Duel.GetFieldGroup(tp,LOCATION_HAND+LOCATION_MZONE,0)
Duel.ConfirmCards(1-tp,cg1)
local cg2=Duel.GetFieldGroup(tp,LOCATION_EXTRA,0)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
if cg1:GetCount()>1 and cg2:IsExists(Card.IsFacedown,1,nil)
and Duel.IsPlayerCanSpecialSummon(tp) and not Duel.IsPlayerAffectedByEffect(tp,27581098) then
Duel.ConfirmCards(1-tp,cg1)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
end
end
end
function c43698897.thcon(e,tp,eg,ep,ev,re,r,rp)
......
script/c44394295.lua
View file @ d6f92cb9
......@@ -80,11 +80,14 @@ function c44394295.activate(e,tp,eg,ep,ev,re,r,rp)
fop(ce,e,tp,tc,mat2)
end
tc:CompleteProcedure()
elseif Duel.IsPlayerCanSpecialSummon(tp) then
else
local cg1=Duel.GetFieldGroup(tp,LOCATION_HAND+LOCATION_MZONE,0)
Duel.ConfirmCards(1-tp,cg1)
local cg2=Duel.GetFieldGroup(tp,LOCATION_EXTRA,0)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
if cg1:GetCount()>1 and cg2:IsExists(Card.IsFacedown,1,nil)
and Duel.IsPlayerCanSpecialSummon(tp) and not Duel.IsPlayerAffectedByEffect(tp,27581098) then
Duel.ConfirmCards(1-tp,cg1)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
end
end
end
script/c55824220.lua
View file @ d6f92cb9
......@@ -65,11 +65,14 @@ function c55824220.activate(e,tp,eg,ep,ev,re,r,rp)
fop(ce,e,tp,tc,mat2)
end
tc:CompleteProcedure()
elseif Duel.IsPlayerCanSpecialSummon(tp) then
else
local cg1=Duel.GetFieldGroup(tp,LOCATION_HAND+LOCATION_MZONE,0)
Duel.ConfirmCards(1-tp,cg1)
local cg2=Duel.GetFieldGroup(tp,LOCATION_EXTRA,0)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
if cg1:GetCount()>1 and cg2:IsExists(Card.IsFacedown,1,nil)
and Duel.IsPlayerCanSpecialSummon(tp) and not Duel.IsPlayerAffectedByEffect(tp,27581098) then
Duel.ConfirmCards(1-tp,cg1)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
end
end
end
script/c60226558.lua
View file @ d6f92cb9
......@@ -119,11 +119,14 @@ function c60226558.spop(e,tp,eg,ep,ev,re,r,rp)
fop(ce,e,tp,tc,mat2)
end
tc:CompleteProcedure()
elseif Duel.IsPlayerCanSpecialSummon(tp) then
else
local cg1=Duel.GetFieldGroup(tp,LOCATION_HAND+LOCATION_MZONE,0)
Duel.ConfirmCards(1-tp,cg1)
local cg2=Duel.GetFieldGroup(tp,LOCATION_EXTRA,0)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
if cg1:GetCount()>1 and cg2:IsExists(Card.IsFacedown,1,nil)
and Duel.IsPlayerCanSpecialSummon(tp) and not Duel.IsPlayerAffectedByEffect(tp,27581098) then
Duel.ConfirmCards(1-tp,cg1)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
end
end
end
script/c6417578.lua
View file @ d6f92cb9
......@@ -67,11 +67,14 @@ function c6417578.activate(e,tp,eg,ep,ev,re,r,rp)
fop(ce,e,tp,tc,mat2)
end
tc:CompleteProcedure()
elseif Duel.IsPlayerCanSpecialSummon(tp) then
else
local cg1=Duel.GetFieldGroup(tp,LOCATION_HAND+LOCATION_MZONE,0)
Duel.ConfirmCards(1-tp,cg1)
local cg2=Duel.GetFieldGroup(tp,LOCATION_EXTRA,0)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
if cg1:GetCount()>1 and cg2:IsExists(Card.IsFacedown,1,nil)
and Duel.IsPlayerCanSpecialSummon(tp) and not Duel.IsPlayerAffectedByEffect(tp,27581098) then
Duel.ConfirmCards(1-tp,cg1)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
end
end
end
script/c65331686.lua
View file @ d6f92cb9
......@@ -105,11 +105,14 @@ function c65331686.operation(e,tp,eg,ep,ev,re,r,rp)
fop(ce,e,tp,tc,mat2)
end
tc:CompleteProcedure()
elseif Duel.IsPlayerCanSpecialSummon(tp) then
else
local cg1=Duel.GetFieldGroup(tp,LOCATION_HAND+LOCATION_MZONE,0)
Duel.ConfirmCards(1-tp,cg1)
local cg2=Duel.GetFieldGroup(tp,LOCATION_EXTRA,0)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
if cg1:GetCount()>1 and cg2:IsExists(Card.IsFacedown,1,nil)
and Duel.IsPlayerCanSpecialSummon(tp) and not Duel.IsPlayerAffectedByEffect(tp,27581098) then
Duel.ConfirmCards(1-tp,cg1)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
end
end
end
script/c73360025.lua
View file @ d6f92cb9
......@@ -111,14 +111,24 @@ function c73360025.spop(e,tp,eg,ep,ev,re,r,rp)
fop(ce,e,tp,tc,mat)
end
tc:CompleteProcedure()
elseif Duel.IsPlayerCanSpecialSummon(tp) then
else
local cg1=Duel.GetFieldGroup(tp,LOCATION_HAND+LOCATION_MZONE,0)
Duel.ConfirmCards(1-tp,cg1)
local cg2=Duel.GetFieldGroup(tp,LOCATION_EXTRA,0)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
local ct=cg1:GetCount()
if not Duel.IsPlayerAffectedByEffect(tp,30459350) then
ct=ct+Duel.GetMatchingGroupCount(c73360025.ctfilter,tp,LOCATION_GRAVE,0,nil)
end
if ct>1 and cg2:IsExists(Card.IsFacedown,1,nil)
and Duel.IsPlayerCanSpecialSummon(tp) and not Duel.IsPlayerAffectedByEffect(tp,27581098) then
Duel.ConfirmCards(1-tp,cg1)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
end
end
end
function c73360025.ctfilter(c)
return c:IsType(TYPE_MONSTER) and c:IsSetCard(0xaf)
end
function c73360025.damcon(e,tp,eg,ep,ev,re,r,rp)
return Duel.GetTurnPlayer()==tp
end
......
script/c94820406.lua
View file @ d6f92cb9
......@@ -71,11 +71,14 @@ function c94820406.activate(e,tp,eg,ep,ev,re,r,rp)
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
e1:SetValue(aux.tgoval)
tc:RegisterEffect(e1)
elseif Duel.IsPlayerCanSpecialSummon(tp) then
else
local cg1=Duel.GetFieldGroup(tp,LOCATION_HAND+LOCATION_MZONE,0)
Duel.ConfirmCards(1-tp,cg1)
local cg2=Duel.GetFieldGroup(tp,LOCATION_EXTRA,0)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
if cg1:GetCount()>1 and cg2:IsExists(Card.IsFacedown,1,nil)
and Duel.IsPlayerCanSpecialSummon(tp) and not Duel.IsPlayerAffectedByEffect(tp,27581098) then
Duel.ConfirmCards(1-tp,cg1)
Duel.ConfirmCards(1-tp,cg2)
Duel.ShuffleHand(tp)
end
end
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