Skip to content

Commit a99bab5

Browse files
pyrQpyrQ
authored
"Sangan" and co. updates
Fixed some instances where cards with restrictions similar to that of "Sangan" would check the card's current name at any given time rather than locking in on the name it had when it moved.
1 parent 8dded85 commit a99bab5

11 files changed

Lines changed: 23 additions & 31 deletions

File tree

‎official/c14055212.lua‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
3333
e1:SetCode(EFFECT_CANNOT_ACTIVATE)
3434
e1:SetTargetRange(1,0)
3535
e1:SetValue(s.aclimit)
36-
e1:SetLabelObject(tc)
36+
e1:SetLabel(tc:GetCode())
3737
e1:SetReset(RESET_PHASE|PHASE_END)
3838
Duel.RegisterEffect(e1,tp)
3939
local e2=Effect.CreateEffect(e:GetHandler())
@@ -46,6 +46,5 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
4646
end
4747
end
4848
function s.aclimit(e,re,tp)
49-
local tc=e:GetLabelObject()
50-
return re:GetHandler():IsCode(tc:GetCode())
49+
return re:GetHandler():IsCode(e:GetLabel())
5150
end

‎official/c18954366.lua‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
7171
e3:SetCode(EFFECT_CANNOT_ACTIVATE)
7272
e3:SetTargetRange(1,0)
7373
e3:SetValue(s.aclimit)
74-
e3:SetLabelObject(tg)
74+
e3:SetLabel(tg:GetCode())
7575
e3:SetReset(RESET_PHASE|PHASE_END)
7676
Duel.RegisterEffect(e3,tp)
7777
end
@@ -81,6 +81,5 @@ function s.eqlimit(e,c)
8181
return c==e:GetLabelObject()
8282
end
8383
function s.aclimit(e,re,tp)
84-
local tc=e:GetLabelObject()
85-
return re:GetHandler():IsCode(tc:GetCode())
84+
return re:GetHandler():IsCode(e:GetLabel())
8685
end

‎official/c25577965.lua‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,14 +41,15 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
4141
local tc=Duel.GetFirstTarget()
4242
if tc:IsRelateToEffect(e) and Duel.SendtoHand(tc,nil,REASON_EFFECT)>0 and tc:IsLocation(LOCATION_HAND) then
4343
Duel.ConfirmCards(1-tp,tc)
44+
local code=tc:GetCode()
4445
--Cannot activate cards, or the effects of cards, with that name
4546
local e1=Effect.CreateEffect(e:GetHandler())
4647
e1:SetDescription(aux.Stringid(id,1))
4748
e1:SetType(EFFECT_TYPE_FIELD)
4849
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CLIENT_HINT)
4950
e1:SetCode(EFFECT_CANNOT_ACTIVATE)
5051
e1:SetTargetRange(1,0)
51-
e1:SetValue(function(e,re,tp) return re:GetHandler():IsCode(tc:GetCode()) end)
52+
e1:SetValue(function(e,re,tp) return re:GetHandler():IsCode(code) end)
5253
e1:SetReset(RESET_PHASE|PHASE_END)
5354
Duel.RegisterEffect(e1,tp)
5455
end

‎official/c26202165.lua‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,12 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
3838
e1:SetCode(EFFECT_CANNOT_ACTIVATE)
3939
e1:SetTargetRange(1,0)
4040
e1:SetValue(s.aclimit)
41-
e1:SetLabelObject(tc)
41+
e1:SetLabel(tc:GetCode())
4242
e1:SetReset(RESET_PHASE|PHASE_END)
4343
Duel.RegisterEffect(e1,tp)
4444
end
4545
end
4646
end
4747
function s.aclimit(e,re,tp)
48-
local tc=e:GetLabelObject()
49-
return re:GetHandler():IsCode(tc:GetCode())
48+
return re:GetHandler():IsCode(e:GetLabel())
5049
end

‎official/c26232916.lua‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -68,14 +68,13 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
6868
e1:SetDescription(aux.Stringid(id,1))
6969
e1:SetTargetRange(1,0)
7070
e1:SetValue(s.aclimit)
71-
e1:SetLabelObject(tc)
71+
e1:SetLabel(tc:GetCode())
7272
e1:SetReset(RESET_PHASE|PHASE_END)
7373
Duel.RegisterEffect(e1,tp)
7474
end
7575
end
7676
function s.aclimit(e,re,tp)
77-
local tc=e:GetLabelObject()
78-
return re:GetHandler():IsCode(tc:GetCode())
77+
return re:GetHandler():IsCode(e:GetLabel())
7978
end
8079
function s.repfilter(c,tp,rp)
8180
return c:IsFaceup() and ((c:IsMonster() and c:IsSetCard(SET_NINJA)) or c:IsSetCard(SET_NINJITSU_ART))

‎official/c2971446.lua‎

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,8 @@ function s.initial_effect(c)
66
--Activate
77
local e1=Effect.CreateEffect(c)
88
e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
9-
e1:SetProperty(EFFECT_FLAG_DELAY)
109
e1:SetType(EFFECT_TYPE_ACTIVATE)
10+
e1:SetProperty(EFFECT_FLAG_DELAY)
1111
e1:SetCode(EVENT_TO_HAND)
1212
e1:SetCountLimit(1,id,EFFECT_COUNT_CODE_OATH)
1313
e1:SetCondition(s.condition)
@@ -42,13 +42,12 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
4242
e1:SetCode(EFFECT_CANNOT_ACTIVATE)
4343
e1:SetTargetRange(1,0)
4444
e1:SetValue(s.aclimit)
45-
e1:SetLabelObject(tc)
45+
e1:SetLabel(tc:GetCode())
4646
e1:SetReset(RESET_PHASE|PHASE_END)
4747
Duel.RegisterEffect(e1,tp)
4848
end
4949
end
5050
end
5151
function s.aclimit(e,re,tp)
52-
local tc=e:GetLabelObject()
53-
return re:GetHandler():IsCode(tc:GetCode())
52+
return re:GetHandler():IsCode(e:GetLabel())
5453
end

‎official/c53871273.lua‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp)
7575
e1:SetCode(EFFECT_CANNOT_ACTIVATE)
7676
e1:SetTargetRange(1,0)
7777
e1:SetValue(s.aclimit)
78-
e1:SetLabelObject(tc)
78+
e1:SetLabel(tc:GetCode())
7979
e1:SetReset(RESET_PHASE|PHASE_END)
8080
Duel.RegisterEffect(e1,tp)
8181
local e2=Effect.CreateEffect(e:GetHandler())
@@ -86,6 +86,5 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp)
8686
end
8787
end
8888
function s.aclimit(e,re,tp)
89-
local tc=e:GetLabelObject()
90-
return re:GetHandler():IsCode(tc:GetCode())
89+
return re:GetHandler():IsCode(e:GetLabel())
9190
end

‎official/c55351724.lua‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
3737
e1:SetCode(EFFECT_CANNOT_ACTIVATE)
3838
e1:SetTargetRange(1,0)
3939
e1:SetValue(s.aclimit)
40-
e1:SetLabelObject(tc)
40+
e1:SetLabel(tc:GetCode())
4141
e1:SetReset(RESET_PHASE|PHASE_END)
4242
Duel.RegisterEffect(e1,tp)
4343
local e2=Effect.CreateEffect(c)
@@ -48,6 +48,5 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
4848
end
4949
end
5050
function s.aclimit(e,re,tp)
51-
local tc=e:GetLabelObject()
52-
return re:GetHandler():IsCode(tc:GetCode())
51+
return re:GetHandler():IsCode(e:GetLabel()))
5352
end

‎official/c78010363.lua‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,12 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
3838
e1:SetCode(EFFECT_CANNOT_ACTIVATE)
3939
e1:SetTargetRange(1,0)
4040
e1:SetValue(s.aclimit)
41-
e1:SetLabelObject(tc)
41+
e1:SetLabel(tc:GetCode())
4242
e1:SetReset(RESET_PHASE|PHASE_END)
4343
Duel.RegisterEffect(e1,tp)
4444
end
4545
end
4646
end
4747
function s.aclimit(e,re,tp)
48-
local tc=e:GetLabelObject()
49-
return re:GetHandler():IsCode(tc:GetCode())
48+
return re:GetHandler():IsCode(e:GetLabel())
5049
end

‎official/c81055000.lua‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,15 +46,14 @@ function s.thop1(e,tp,eg,ep,ev,re,r,rp)
4646
e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
4747
e1:SetCode(EFFECT_CANNOT_ACTIVATE)
4848
e1:SetTargetRange(1,0)
49-
e1:SetLabelObject(tc)
49+
e1:SetLabel(tc:GetCode())
5050
e1:SetValue(s.aclimit)
5151
e1:SetReset(RESET_PHASE|PHASE_END)
5252
Duel.RegisterEffect(e1,tp)
5353
end
5454
end
5555
function s.aclimit(e,re,tp)
56-
local tc=e:GetLabelObject()
57-
return re:GetHandler():IsCode(tc:GetCode())
56+
return re:GetHandler():IsCode(e:GetLabel())
5857
end
5958
function s.thtg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
6059
if chkc then return chkc:IsOnField() and chkc:IsAbleToHand() end

0 commit comments

Comments
 (0)