Commit 8ad10a70 authored by POLYMER's avatar POLYMER

fix

parent f847d875
...@@ -91,9 +91,16 @@ function s.limit_hack_op(e) ...@@ -91,9 +91,16 @@ function s.limit_hack_op(e)
return not nc:IsCode(id) and not (nc:IsSetCard(0x3a32) and Duel.IsPlayerAffectedByEffect(nc:GetControler(),id)) and resolve_target(ne,nc,...) return not nc:IsCode(id) and not (nc:IsSetCard(0x3a32) and Duel.IsPlayerAffectedByEffect(nc:GetControler(),id)) and resolve_target(ne,nc,...)
end ) end )
resolve_effect:SetValue( resolve_effect:SetValue(
function(ne,nte,ntp,...) function(ne,nte,ntp,...)
return not nte:GetHandler():IsCode(id) and not (nte:GetHandler():IsSetCard(0x3a32) and Duel.IsPlayerAffectedByEffect(nte:GetHandlerPlayer(),id)) and resolve_value(ne,nte,ntp,...) if nte:GetHandler():IsCode(id) or (nte:GetHandler():IsSetCard(0x3a32) and Duel.IsPlayerAffectedByEffect(nte:GetHandlerPlayer(),id)) then
end ) return false
end
if type(resolve_value) == "function" then
return resolve_value(ne,nte,ntp,...)
else
return resolve_value
end
end )
end end
end end
end end
...@@ -139,7 +146,14 @@ function s.limit_hack_op2(e) ...@@ -139,7 +146,14 @@ function s.limit_hack_op2(e)
end ) end )
spsummon_effect:SetValue( spsummon_effect:SetValue(
function(ne,nte,ntp,...) function(ne,nte,ntp,...)
return not (nte:GetHandler():IsSetCard(0x3a32) and Duel.IsPlayerAffectedByEffect(nc:GetControler(),id)) and spsummon_value(ne,nte,ntp,...) if nte:GetHandler():IsSetCard(0x3a32) and Duel.IsPlayerAffectedByEffect(nc:GetControler(),id) then
return false
end
if type(spsummon_value) == "function" then
return spsummon_value(ne,nte,ntp,...)
else
return spsummon_value
end
end ) end )
end end
end end
......
...@@ -127,7 +127,7 @@ function s.descost(e,tp,eg,ep,ev,re,r,rp,chk) ...@@ -127,7 +127,7 @@ function s.descost(e,tp,eg,ep,ev,re,r,rp,chk)
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK)
local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,0,#mg+1,nil) local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,0,#mg+1,nil)
Duel.HintSelection(g) Duel.HintSelection(g)
local g1=Group.__add(g,mg) local g1=g+mg --Group.__add(g,mg)
if g1 then if g1 then
local count=Duel.SendtoDeck(g1,nil,SEQ_DECKSHUFFLE,REASON_COST) local count=Duel.SendtoDeck(g1,nil,SEQ_DECKSHUFFLE,REASON_COST)
if count then if count then
......
...@@ -38,6 +38,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -38,6 +38,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.SendtoHand(g,nil,REASON_EFFECT)
local ct=g:GetCount() local ct=g:GetCount()
if Duel.IsExistingMatchingCard(Card.IsOriginalCodeRule,tp,LOCATION_HAND,0,ct,nil,id) then if Duel.IsExistingMatchingCard(Card.IsOriginalCodeRule,tp,LOCATION_HAND,0,ct,nil,id) then
Duel.ShuffleHand(tp)
local g1=Duel.SelectMatchingCard(tp,Card.IsOriginalCodeRule,tp,LOCATION_HAND,0,ct,ct,nil,id) local g1=Duel.SelectMatchingCard(tp,Card.IsOriginalCodeRule,tp,LOCATION_HAND,0,ct,ct,nil,id)
Duel.ConfirmCards(1-tp,g1) Duel.ConfirmCards(1-tp,g1)
else else
......
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