Skip to content

Y
ygopro
Commit dbe5fa27 authored by salix5's avatar salix5
Browse files
Options

Merge pull request #1450 from DailyShana/patch-3 

fix returning control
parents cde8fa37 4fb9a148
Hide whitespace changes
Inline Side-by-side
Showing with 15 additions and 7 deletions
ocgcore/operations.cpp
View file @ dbe5fa27
...@@ -1022,7 +1022,7 @@ int32 field::control_adjust(uint16 step) { ...@@ -1022,7 +1022,7 @@ int32 field::control_adjust(uint16 step) {
}; };
case 5: { case 5: {
if(core.destroy_set.size()) if(core.destroy_set.size())
send_to(&core.destroy_set, 0, REASON_RULE, PLAYER_NONE, PLAYER_NONE, LOCATION_GRAVE, 0, POS_FACEUP); destroy(&core.destroy_set, 0, REASON_RULE, PLAYER_NONE);
return TRUE; return TRUE;
} }
} }
......
script/c10000080.lua
View file @ dbe5fa27
...@@ -110,9 +110,13 @@ function c10000080.retcon(e,tp,eg,ep,ev,re,r,rp) ...@@ -110,9 +110,13 @@ function c10000080.retcon(e,tp,eg,ep,ev,re,r,rp)
end end
function c10000080.retop(e,tp,eg,ep,ev,re,r,rp) function c10000080.retop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetOwner() local c=e:GetOwner()
if c:GetControler()~=c:GetOwner() then c:ResetEffect(EFFECT_SET_CONTROL,RESET_CODE)
Duel.GetControl(c,c:GetOwner()) local e1=Effect.CreateEffect(c)
end e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_SET_CONTROL)
e1:SetValue(c:GetOwner())
e1:SetReset(RESET_EVENT+0xec0000)
c:RegisterEffect(e1)
end end
function c10000080.spcost(e,tp,eg,ep,ev,re,r,rp,chk) function c10000080.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
if chk==0 then return e:GetHandler():IsReleasable() end if chk==0 then return e:GetHandler():IsReleasable() end
......
script/c93983867.lua
View file @ dbe5fa27
...@@ -58,7 +58,11 @@ function c93983867.activate(e,tp,eg,ep,ev,re,r,rp) ...@@ -58,7 +58,11 @@ function c93983867.activate(e,tp,eg,ep,ev,re,r,rp)
end end
function c93983867.retop(e,tp,eg,ep,ev,re,r,rp) function c93983867.retop(e,tp,eg,ep,ev,re,r,rp)
local c=e:GetHandler() local c=e:GetHandler()
if c:GetControler()~=c:GetOwner() then c:ResetEffect(EFFECT_SET_CONTROL,RESET_CODE)
Duel.GetControl(c,c:GetOwner()) local e1=Effect.CreateEffect(c)
end e1:SetType(EFFECT_TYPE_SINGLE)
e1:SetCode(EFFECT_SET_CONTROL)
e1:SetValue(c:GetOwner())
e1:SetReset(RESET_EVENT+0xec0000)
c:RegisterEffect(e1)
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