Skip to content

Commit 80fcce6

Browse files
larry126larry126
committed
Several script fixes
1 parent a088191 commit 80fcce6

16 files changed

+109
-171
lines changed

‎unofficial/c150000000.lua‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
--地縛原
22
--Earthbound Tundra
33
--Scripted by Larry126
4+
local s,id=GetID()
45
function s.initial_effect(c)
56
--cannot summon in def
67
local e1=Effect.CreateEffect(c)

‎unofficial/c150000004.lua‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp)
4343
e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
4444
tc:RegisterEffect(e2)
4545
local e3=Effect.CreateEffect(c)
46-
e3:SetDescription(aux.Stringid(id,`))
46+
e3:SetDescription(aux.Stringid(id,1))
4747
e3:SetProperty(EFFECT_FLAG_CLIENT_HINT)
4848
e3:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
4949
tc:RegisterEffect(e3)

‎unofficial/c150000011.lua‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@ function c150000011.initial_effect(c)
1313
e2:SetType(EFFECT_TYPE_SINGLE)
1414
e2:SetCode(EFFECT_BECOME_QUICK)
1515
c:RegisterEffect(e2)
16-
local e3=Effect.CreateEffect(c)
17-
e3:SetType(EFFECT_TYPE_SINGLE)
18-
e3:SetCode(EFFECT_REMOVE_TYPE)
19-
e3:SetValue(TYPE_QUICKPLAY)
20-
c:RegisterEffect(e3)
2116
end
2217
function c150000011.condition(e,tp,eg,ep,ev,re,r,rp)
2318
return (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE)

‎unofficial/c150000031.lua‎

Lines changed: 15 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,37 @@
1+
--フリーズ・フリーザー
12
--Freeze Freezer
2-
function c150000031.initial_effect(c)
3+
local s,id=GetID()
4+
function s.initial_effect(c)
35
--Activate
46
local e1=Effect.CreateEffect(c)
57
e1:SetType(EFFECT_TYPE_ACTIVATE)
68
e1:SetCode(EVENT_FREE_CHAIN)
7-
e1:SetCondition(c150000031.condition)
8-
e1:SetOperation(c150000031.activate)
9+
e1:SetCondition(s.condition)
10+
e1:SetOperation(s.activate)
911
c:RegisterEffect(e1)
1012
--become action card
1113
local e2=Effect.CreateEffect(c)
1214
e2:SetType(EFFECT_TYPE_SINGLE)
1315
e2:SetCode(EFFECT_BECOME_QUICK)
1416
e2:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_IGNORE_IMMUNE)
1517
c:RegisterEffect(e2)
16-
local e3=e2:Clone()
17-
e3:SetCode(EFFECT_REMOVE_TYPE)
18-
e3:SetValue(TYPE_QUICKPLAY)
19-
c:RegisterEffect(e3)
2018
end
21-
function c150000031.actcondition(e,tp,eg,ep,ev,re,r,rp)
22-
return Duel.GetTurnPlayer()~=tp and Duel.GetCurrentPhase()==PHASE_BATTLE
19+
function s.condition(e,tp,eg,ep,ev,re,r,rp)
20+
return Duel.IsAbleToEnterBP() or (Duel.GetCurrentPhase()>=PHASE_BATTLE_START and Duel.GetCurrentPhase()<=PHASE_BATTLE)
2321
end
24-
function c150000031.activate(e,tp,eg,ep,ev,re,r,rp)
22+
function s.activate(e,tp,eg,ep,ev,re,r,rp)
2523
local e1=Effect.CreateEffect(e:GetHandler())
2624
e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
2725
e1:SetCode(EVENT_ATTACK_ANNOUNCE)
28-
e1:SetCondition(c150000031.condition)
29-
e1:SetOperation(c150000031.operation)
26+
e1:SetCondition(s.con)
27+
e1:SetOperation(s.op)
3028
e1:SetReset(RESET_PHASE+PHASE_END)
3129
Duel.RegisterEffect(e1,tp)
3230
end
33-
function c150000031.condition(e,tp,eg,ep,ev,re,r,rp)
34-
return tp~=Duel.GetTurnPlayer()
31+
function s.con(e,tp,eg,ep,ev,re,r,rp)
32+
return not Duel.GetAttacker():IsControler(tp)
3533
end
36-
function c150000031.operation(e,tp,eg,ep,ev,re,r,rp)
37-
Duel.Hint(HINT_CARD,0,95000134)
34+
function s.op(e,tp,eg,ep,ev,re,r,rp)
35+
Duel.Hint(HINT_CARD,0,id)
3836
Duel.NegateAttack()
39-
end
37+
end

‎unofficial/c150000068.lua‎

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,41 +1,39 @@
1+
--不撓不屈
12
--Tenacity
2-
function c150000069.initial_effect(c)
3+
local s,id=GetID()
4+
function s.initial_effect(c)
35
--activate
46
local e1=Effect.CreateEffect(c)
57
e1:SetCategory(CATEGORY_CONTROL)
68
e1:SetType(EFFECT_TYPE_ACTIVATE)
79
e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
810
e1:SetCode(EVENT_FREE_CHAIN)
9-
e1:SetTarget(c150000069.target)
10-
e1:SetOperation(c150000069.activate)
11+
e1:SetTarget(s.target)
12+
e1:SetOperation(s.activate)
1113
c:RegisterEffect(e1)
1214
--become action card
1315
local e2=Effect.CreateEffect(c)
1416
e2:SetType(EFFECT_TYPE_SINGLE)
1517
e2:SetCode(EFFECT_BECOME_QUICK)
1618
e2:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_IGNORE_IMMUNE)
1719
c:RegisterEffect(e2)
18-
local e3=e2:Clone()
19-
e3:SetCode(EFFECT_REMOVE_TYPE)
20-
e3:SetValue(TYPE_QUICKPLAY)
21-
c:RegisterEffect(e3)
2220
end
23-
function c150000069.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
21+
function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
2422
local g=Duel.GetFieldGroup(tp,LOCATION_MZONE,0)
2523
local tc=g:GetFirst()
2624
if chkc then return chkc:IsControler(tp) and g:IsContains(chkc) and chkc:IsCanBeEffectTarget(e) end
2725
if chk==0 then return g:GetCount()==1 and tc:IsCanBeEffectTarget(e) end
2826
Duel.SetTargetCard(g)
2927
Duel.SetOperationInfo(0,CATEGORY_CONTROL,g,1,0,0)
3028
end
31-
function c150000069.activate(e,tp,eg,ep,ev,re,r,rp)
29+
function s.activate(e,tp,eg,ep,ev,re,r,rp)
3230
local tc=Duel.GetFirstTarget()
3331
if tc and tc:IsRelateToEffect(e) then
3432
local e1=Effect.CreateEffect(e:GetHandler())
3533
e1:SetType(EFFECT_TYPE_SINGLE)
3634
e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
37-
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
35+
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
3836
e1:SetValue(1)
3937
tc:RegisterEffect(e1)
4038
end
41-
end
39+
end

‎unofficial/c150000069.lua‎

Lines changed: 11 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,45 +1,37 @@
1+
--ティンクル・コメット
12
--Twinkle Comet
2-
function c150000069.initial_effect(c)
3+
local s,id=GetID()
4+
function s.initial_effect(c)
35
--Activate
46
local e1=Effect.CreateEffect(c)
57
e1:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DAMAGE)
68
e1:SetType(EFFECT_TYPE_ACTIVATE)
79
e1:SetHintTiming(TIMING_DAMAGE_STEP)
810
e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
911
e1:SetCode(EVENT_FREE_CHAIN)
10-
e1:SetCondition(c150000069.condition)
11-
e1:SetTarget(c150000069.target)
12-
e1:SetOperation(c150000069.activate)
12+
e1:SetCondition(s.condition)
13+
e1:SetTarget(s.target)
14+
e1:SetOperation(s.activate)
1315
c:RegisterEffect(e1)
14-
--become action card
15-
local e2=Effect.CreateEffect(c)
16-
e2:SetType(EFFECT_TYPE_SINGLE)
17-
e2:SetCode(EFFECT_BECOME_QUICK)
18-
e2:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_IGNORE_IMMUNE)
19-
c:RegisterEffect(e2)
20-
local e3=e2:Clone()
21-
e3:SetCode(EFFECT_REMOVE_TYPE)
22-
e3:SetValue(TYPE_QUICKPLAY)
23-
c:RegisterEffect(e3)
2416
end
25-
function c150000069.condition(e,tp,eg,ep,ev,re,r,rp)
17+
function s.condition(e,tp,eg,ep,ev,re,r,rp)
2618
return Duel.GetCurrentPhase()~=PHASE_DAMAGE or not Duel.IsDamageCalculated()
2719
end
28-
function c150000069.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
20+
function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
2921
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsFaceup() end
3022
if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
3123
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
3224
Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
3325
end
34-
function c150000069.activate(e,tp,eg,ep,ev,re,r,rp)
26+
function s.activate(e,tp,eg,ep,ev,re,r,rp)
3527
local tc=Duel.GetFirstTarget()
3628
if tc:IsRelateToEffect(e) and tc:IsFaceup() then
3729
local e1=Effect.CreateEffect(e:GetHandler())
3830
e1:SetType(EFFECT_TYPE_SINGLE)
3931
e1:SetCode(EFFECT_UPDATE_ATTACK)
40-
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
32+
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
4133
e1:SetValue(-1000)
4234
tc:RegisterEffect(e1)
4335
Duel.Damage(1-tp,500,REASON_EFFECT)
4436
end
45-
end
37+
end

‎unofficial/c150000070.lua‎

Lines changed: 10 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,35 @@
1+
--ヴィクトリー・トッピング
12
--Victory Topping
2-
function c150000070.initial_effect(c)
3+
local s,id=GetID()
4+
function s.initial_effect(c)
35
--Activate
46
local e1=Effect.CreateEffect(c)
57
e1:SetType(EFFECT_TYPE_ACTIVATE)
68
e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
79
e1:SetCode(EVENT_FREE_CHAIN)
8-
e1:SetTarget(c150000070.target)
9-
e1:SetOperation(c150000070.activate)
10+
e1:SetTarget(s.target)
11+
e1:SetOperation(s.activate)
1012
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)
2113
end
22-
function c150000070.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
14+
function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
2315
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) and chkc:IsFaceup() end
2416
if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,0,1,nil) end
2517
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
2618
Duel.SelectTarget(tp,Card.IsFaceup,tp,LOCATION_MZONE,0,1,1,nil)
2719
end
28-
function c150000070.activate(e,tp,eg,ep,ev,re,r,rp)
20+
function s.activate(e,tp,eg,ep,ev,re,r,rp)
2921
local tc=Duel.GetFirstTarget()
3022
if tc:IsRelateToEffect(e) and tc:IsFaceup() then
3123
local e1=Effect.CreateEffect(e:GetHandler())
3224
e1:SetType(EFFECT_TYPE_SINGLE)
3325
e1:SetCode(EFFECT_UPDATE_ATTACK)
3426
e1:SetValue(600)
35-
e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
27+
e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
3628
tc:RegisterEffect(e1)
37-
if Duel.IsExistingTarget(Card.IsDefensePos,tp,0,LOCATION_MZONE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(95000139,0)) then
29+
if Duel.IsExistingTarget(Card.IsDefensePos,tp,0,LOCATION_MZONE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
3830
local g=Duel.SelectTarget(tp,Card.IsDefensePos,tp,0,LOCATION_MZONE,1,1,nil)
3931
local tg=g:GetFirst()
4032
Duel.ChangePosition(tg,0,0,POS_FACEUP_ATTACK,POS_FACEUP_ATTACK)
4133
end
4234
end
43-
end
35+
end

‎unofficial/c150000071.lua‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,38 +1,30 @@
1+
--ワンダーチャンス
12
--Wonder Chance
2-
function c150000071.initial_effect(c)
3+
local s,id=GetID()
4+
function s.initial_effect(c)
35
--Activate
46
local e1=Effect.CreateEffect(c)
57
e1:SetType(EFFECT_TYPE_ACTIVATE)
68
e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
79
e1:SetCode(EVENT_FREE_CHAIN)
8-
e1:SetTarget(c150000071.target)
9-
e1:SetOperation(c150000071.activate)
10+
e1:SetTarget(s.target)
11+
e1:SetOperation(s.activate)
1012
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)
2113
end
22-
function c150000071.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
14+
function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
2315
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) end
2416
if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,LOCATION_MZONE,0,1,nil) end
2517
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
2618
Duel.SelectTarget(tp,IsFaceup,tp,LOCATION_MZONE,0,1,1,nil)
2719
end
28-
function c150000071.activate(e,tp,eg,ep,ev,re,r,rp)
20+
function s.activate(e,tp,eg,ep,ev,re,r,rp)
2921
local tc=Duel.GetFirstTarget()
3022
if tc:IsRelateToEffect(e) and tc:IsFaceup() then
3123
local e2=Effect.CreateEffect(e:GetHandler())
3224
e2:SetType(EFFECT_TYPE_SINGLE)
3325
e2:SetCode(EFFECT_EXTRA_ATTACK)
34-
e2:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
26+
e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
3527
e2:SetValue(1)
3628
tc:RegisterEffect(e2)
3729
end
38-
end
30+
end

‎unofficial/c150000072.lua‎

Lines changed: 9 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,39 +1,31 @@
1+
--ゼロ・ペナルティ
12
--Zero Penalty
2-
function c150000072.initial_effect(c)
3+
local s,id=GetID()
4+
function s.initial_effect(c)
35
--Activate
46
local e1=Effect.CreateEffect(c)
57
e1:SetCategory(CATEGORY_ATKCHANGE)
68
e1:SetType(EFFECT_TYPE_ACTIVATE)
79
e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
810
e1:SetCode(EVENT_FREE_CHAIN)
9-
e1:SetTarget(c150000072.target)
10-
e1:SetOperation(c150000072.activate)
11+
e1:SetTarget(s.target)
12+
e1:SetOperation(s.activate)
1113
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)
2214
end
23-
function c150000072.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
15+
function s.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
2416
if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(1-tp) and chkc:IsFaceup() end
2517
if chk==0 then return Duel.IsExistingTarget(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil) end
2618
Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
2719
Duel.SelectTarget(tp,Card.IsFaceup,tp,0,LOCATION_MZONE,1,1,nil)
2820
end
29-
function c150000072.activate(e,tp,eg,ep,ev,re,r,rp)
21+
function s.activate(e,tp,eg,ep,ev,re,r,rp)
3022
local tc=Duel.GetFirstTarget()
3123
if tc:IsFaceup() and tc:IsRelateToEffect(e) and not tc:IsImmuneToEffect(e) then
3224
local e1=Effect.CreateEffect(e:GetHandler())
3325
e1:SetType(EFFECT_TYPE_SINGLE)
3426
e1:SetCode(EFFECT_SET_ATTACK_FINAL)
3527
e1:SetValue(0)
36-
e1:SetReset(RESET_EVENT+0x1fe0000)
28+
e1:SetReset(RESET_EVENT+RESETS_STANDARD)
3729
tc:RegisterEffect(e1)
3830
end
39-
end
31+
end

0 commit comments

Comments
 (0)