Skip to content

Commit 4d24716

Browse files
larry126larry126
committed
Scripts cleanup and a few fixes
1 parent e46715d commit 4d24716

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+177
-631
lines changed

‎unofficial/c150000001.lua‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ function s.initial_effect(c)
99
e1:SetCondition(s.condition)
1010
e1:SetOperation(s.operation)
1111
c:RegisterEffect(e1)
12-
--become action card
13-
local e2=Effect.CreateEffect(c)
14-
e2:SetType(EFFECT_TYPE_SINGLE)
15-
e2:SetCode(EFFECT_BECOME_QUICK)
16-
e2:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_IGNORE_IMMUNE)
17-
c:RegisterEffect(e2)
1812
end
1913
function s.condition(e,tp,eg,ep,ev,re,r,rp)
2014
local ex,cg,ct,cp,cv=Duel.GetOperationInfo(ev,CATEGORY_DAMAGE)

‎unofficial/c150000002.lua‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ function s.initial_effect(c)
99
e1:SetCondition(s.condition)
1010
e1:SetOperation(s.activate)
1111
c:RegisterEffect(e1)
12-
--become action card
13-
local e2=Effect.CreateEffect(c)
14-
e2:SetType(EFFECT_TYPE_SINGLE)
15-
e2:SetCode(EFFECT_BECOME_QUICK)
16-
e2:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_IGNORE_IMMUNE)
17-
c:RegisterEffect(e2)
1812
end
1913
function s.condition(e,tp,eg,ep,ev,re,r,rp)
2014
local tc=Duel.GetAttacker()

‎unofficial/c150000003.lua‎

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -9,12 +9,6 @@ function s.initial_effect(c)
99
e1:SetCondition(s.condition)
1010
e1:SetOperation(s.activate)
1111
c:RegisterEffect(e1)
12-
--become action card
13-
local e2=Effect.CreateEffect(c)
14-
e2:SetType(EFFECT_TYPE_SINGLE)
15-
e2:SetCode(EFFECT_BECOME_QUICK)
16-
e2:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_IGNORE_IMMUNE)
17-
c:RegisterEffect(e2)
1812
end
1913
function s.condition(e,tp,eg,ep,ev,re,r,rp)
2014
local tc=Duel.GetAttacker()
@@ -36,6 +30,6 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
3630
e1:SetCode(EFFECT_UPDATE_ATTACK)
3731
e1:SetValue(600)
3832
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_DAMAGE_CAL)
39-
tc:RegisterEffect(e1)
33+
tc:RegisterEffect(e1)
4034
end
4135
end

‎unofficial/c150000004.lua‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,12 +12,6 @@ function s.initial_effect(c)
1212
e1:SetTarget(s.target)
1313
e1:SetOperation(s.operation)
1414
c:RegisterEffect(e1)
15-
--become action card
16-
local e2=Effect.CreateEffect(c)
17-
e2:SetType(EFFECT_TYPE_SINGLE)
18-
e2:SetCode(EFFECT_BECOME_QUICK)
19-
e2:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_IGNORE_IMMUNE)
20-
c:RegisterEffect(e2)
2115
end
2216
function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
2317
if chkc then return chkc==eg:GetFirst() end

‎unofficial/c150000005.lua‎

Lines changed: 11 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
--バトル・チェンジ
12
--Battle Change
23
local s,id=GetID()
34
function s.initial_effect(c)
@@ -8,42 +9,32 @@ function s.initial_effect(c)
89
e1:SetCondition(s.condition)
910
e1:SetOperation(s.activate)
1011
c:RegisterEffect(e1)
11-
--become action card
12-
local e2=Effect.CreateEffect(c)
13-
e2:SetType(EFFECT_TYPE_SINGLE)
14-
e2:SetCode(EFFECT_BECOME_QUICK)
15-
e2:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_IGNORE_IMMUNE)
16-
c:RegisterEffect(e2)
17-
local e3=e2:Clone()
18-
e3:SetCode(EFFECT_REMOVE_TYPE)
19-
e3:SetValue(TYPE_QUICKPLAY)
20-
c:RegisterEffect(e3)
2112
end
22-
function s.actcondition(e,tp,eg,ep,ev,re,r,rp)
23-
return Duel.GetTurnPlayer()~=tp and Duel.GetCurrentPhase()==PHASE_BATTLE
13+
function s.condition(e,tp,eg,ep,ev,re,r,rp)
14+
return Duel.GetTurnPlayer()~=tp and Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE
2415
end
2516
function s.activate(e,tp,eg,ep,ev,re,r,rp)
2617
local e1=Effect.CreateEffect(e:GetHandler())
2718
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
2819
e1:SetCode(EVENT_ATTACK_ANNOUNCE)
29-
e1:SetCondition(s.condition)
30-
e1:SetOperation(s.operation)
20+
e1:SetCondition(s.con)
21+
e1:SetOperation(s.op)
3122
e1:SetReset(RESET_PHASE+PHASE_END)
3223
Duel.RegisterEffect(e1,tp)
3324
end
34-
function s.condition(e,tp,eg,ep,ev,re,r,rp)
35-
return tp~=Duel.GetTurnPlayer() and Duel.GetAttacker():GetFlagEffect(id)==0
25+
function s.con(e,tp,eg,ep,ev,re,r,rp)
26+
return not Duel.GetAttacker():IsContains(tp) and Duel.GetAttacker():GetFlagEffect(id)==0
3627
end
37-
function s.operation(e,tp,eg,ep,ev,re,r,rp)
28+
function s.op(e,tp,eg,ep,ev,re,r,rp)
3829
local ats=eg:GetFirst():GetAttackableTarget()
3930
local at=Duel.GetAttackTarget()
4031
if #ats==0 or (at and #ats==1) then return end
41-
if Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
42-
Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(id,1))
32+
if Duel.SelectEffectYesNo(tp,e:GetHandler()) then
33+
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATTACKTARGET)
4334
local g=ats:Select(tp,1,1,at)
4435
Duel.Hint(HINT_CARD,0,id)
4536
Duel.HintSelection(g)
4637
Duel.ChangeAttackTarget(g:GetFirst())
4738
Duel.GetAttacker():RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD,0,1)
4839
end
49-
end
40+
end

‎unofficial/c150000006.lua‎

Lines changed: 3 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
--バトル・ロック
12
--Battle Lock
23
local s,id=GetID()
34
function s.initial_effect(c)
@@ -9,20 +10,9 @@ function s.initial_effect(c)
910
e1:SetCondition(s.condition)
1011
e1:SetOperation(s.activate)
1112
c:RegisterEffect(e1)
12-
--become action card
13-
local e2=Effect.CreateEffect(c)
14-
e2:SetType(EFFECT_TYPE_SINGLE)
15-
e2:SetCode(EFFECT_BECOME_QUICK)
16-
e2:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_IGNORE_IMMUNE)
17-
c:RegisterEffect(e2)
18-
local e3=e2:Clone()
19-
e3:SetCode(EFFECT_REMOVE_TYPE)
20-
e3:SetValue(TYPE_QUICKPLAY)
21-
c:RegisterEffect(e3)
2213
end
2314
function s.condition(e,tp,eg,ep,ev,re,r,rp)
24-
local ph=Duel.GetCurrentPhase()
25-
return tp~=Duel.GetTurnPlayer() and (ph&PHASE_MAIN2+PHASE_END)==0
15+
return Duel.IsAbleToEnterBP() or (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE)
2616
end
2717
function s.activate(e,tp,eg,ep,ev,re,r,rp)
2818
local e1=Effect.CreateEffect(e:GetHandler())
@@ -32,4 +22,4 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
3222
e1:SetReset(RESET_PHASE+PHASE_END)
3323
e1:SetTargetRange(0,1)
3424
Duel.RegisterEffect(e1,tp)
35-
end
25+
end

‎unofficial/c150000007.lua‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
--ベンケイ・ガード
12
--Benkei Guard
23
local s,id=GetID()
34
function s.initial_effect(c)
@@ -9,16 +10,6 @@ function s.initial_effect(c)
910
e1:SetTarget(s.target)
1011
e1:SetOperation(s.activate)
1112
c:RegisterEffect(e1)
12-
--become action card
13-
local e2=Effect.CreateEffect(c)
14-
e2:SetType(EFFECT_TYPE_SINGLE)
15-
e2:SetCode(EFFECT_BECOME_QUICK)
16-
e2:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_IGNORE_IMMUNE)
17-
c:RegisterEffect(e2)
18-
local e3=e2:Clone()
19-
e3:SetCode(EFFECT_REMOVE_TYPE)
20-
e3:SetValue(TYPE_QUICKPLAY)
21-
c:RegisterEffect(e3)
2213
end
2314
s.listed_names={id+1}
2415
function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -63,4 +54,4 @@ function s.indesval(e,re)
6354
end
6455
function s.attg(e,c)
6556
return c:IsCode(id+1)
66-
end
57+
end

‎unofficial/c150000009.lua‎

Lines changed: 3 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
--Blind Blizzard
1+
--ブラインド・ブリザード
2+
--Blinding Blizzard
23
local s,id=GetID()
34
function s.initial_effect(c)
45
--Activate
@@ -9,20 +10,10 @@ function s.initial_effect(c)
910
e1:SetCondition(s.condition)
1011
e1:SetOperation(s.activate)
1112
c:RegisterEffect(e1)
12-
--become action card
13-
local e2=Effect.CreateEffect(c)
14-
e2:SetType(EFFECT_TYPE_SINGLE)
15-
e2:SetCode(EFFECT_BECOME_QUICK)
16-
e2:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_IGNORE_IMMUNE)
17-
c:RegisterEffect(e2)
18-
local e3=e2:Clone()
19-
e3:SetCode(EFFECT_REMOVE_TYPE)
20-
e3:SetValue(TYPE_QUICKPLAY)
21-
c:RegisterEffect(e3)
2213
end
2314
function s.condition(e,tp,eg,ep,ev,re,r,rp)
2415
return (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE)
2516
end
2617
function s.activate(e,tp,eg,ep,ev,re,r,rp)
2718
Duel.SkipPhase(1-tp,PHASE_BATTLE,RESET_PHASE+PHASE_BATTLE,1)
28-
end
19+
end

‎unofficial/c150000010.lua‎

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
--ブレイク・ルイン
12
--Broken Ruin
23
local s,id=GetID()
34
function s.initial_effect(c)
@@ -9,16 +10,6 @@ function s.initial_effect(c)
910
e1:SetTarget(s.target)
1011
e1:SetOperation(s.activate)
1112
c:RegisterEffect(e1)
12-
--become action card
13-
local e2=Effect.CreateEffect(c)
14-
e2:SetType(EFFECT_TYPE_SINGLE)
15-
e2:SetCode(EFFECT_BECOME_QUICK)
16-
e2:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_IGNORE_IMMUNE)
17-
c:RegisterEffect(e2)
18-
local e3=e2:Clone()
19-
e3:SetCode(EFFECT_REMOVE_TYPE)
20-
e3:SetValue(TYPE_QUICKPLAY)
21-
c:RegisterEffect(e3)
2213
end
2314
function s.filter(c)
2415
return c:IsFaceup() and c:GetLevel()>0
@@ -42,4 +33,4 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
4233
local dam=(Duel.GetFieldGroupCount(tp,0,LOCATION_ONFIELD)-Duel.GetFieldGroupCount(tp,LOCATION_ONFIELD,0))*300
4334
end
4435
Duel.Damage(p,dam,REASON_EFFECT)
45-
end
36+
end

‎unofficial/c150000011.lua‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
--大脱出
12
--Big Escape
23
local s,id=GetID()
34
function s.initial_effect(c)
@@ -9,15 +10,10 @@ function s.initial_effect(c)
910
e1:SetCondition(s.condition)
1011
e1:SetOperation(s.activate)
1112
c:RegisterEffect(e1)
12-
--become action card
13-
local e2=Effect.CreateEffect(c)
14-
e2:SetType(EFFECT_TYPE_SINGLE)
15-
e2:SetCode(EFFECT_BECOME_QUICK)
16-
c:RegisterEffect(e2)
1713
end
1814
function s.condition(e,tp,eg,ep,ev,re,r,rp)
1915
return (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE)
2016
end
2117
function s.activate(e,tp,eg,ep,ev,re,r,rp)
2218
Duel.SkipPhase(1-tp,PHASE_BATTLE,RESET_PHASE+PHASE_BATTLE,1)
23-
end
19+
end

0 commit comments

Comments
 (0)