diff --git a/rush/c160001022.lua b/rush/c160001022.lua index 8ec9b1b8b7..27bcbbf69c 100644 --- a/rush/c160001022.lua +++ b/rush/c160001022.lua @@ -1,5 +1,5 @@ --暁の勇者ライダクロス ---Raidacross, Hero of Dawn +--Raidacross, Hero of the Dawn local s,id=GetID() function s.initial_effect(c) --Special summon up to 2 level 5 or lower spellcaster monsters from hand diff --git a/rush/c160001024.lua b/rush/c160001024.lua index 920969fbb5..2cf87530bc 100644 --- a/rush/c160001024.lua +++ b/rush/c160001024.lua @@ -39,7 +39,7 @@ function s.op(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_OATH) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end end diff --git a/rush/c160001025.lua b/rush/c160001025.lua index e09ee8fadd..24115c266e 100644 --- a/rush/c160001025.lua +++ b/rush/c160001025.lua @@ -38,7 +38,7 @@ function s.op(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_OATH) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end end diff --git a/rush/c160001028.lua b/rush/c160001028.lua index 1e2c5974e5..eed717f846 100644 --- a/rush/c160001028.lua +++ b/rush/c160001028.lua @@ -1,5 +1,5 @@ --彩光のプリマギターナ ---Prima Guitarna of the Colorful Light +--Prima Guitarna the Shining Superstar local s,id=GetID() function s.initial_effect(c) --ATK increase diff --git a/rush/c160001029.lua b/rush/c160001029.lua index 6b452d62ef..f406abf149 100644 --- a/rush/c160001029.lua +++ b/rush/c160001029.lua @@ -1,5 +1,5 @@ --ジャンク・ブレイカー ---Fiendish Commander Yameruler +--Yamiruler the Dark Delayer local s,id=GetID() function s.initial_effect(c) --disable @@ -39,7 +39,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetRange(LOCATION_MZONE) e1:SetCode(EFFECT_CANNOT_SUMMON) e1:SetTarget(s.sumlimit) - e1:SetReset(RESETS_STANDARD_PHASE_END+RESET_OPPO_TURN,1) + e1:SetReset(RESETS_STANDARD_PHASE_END|RESET_OPPO_TURN,1) e1:SetTargetRange(1,1) c:RegisterEffect(e1) local e2=e1:Clone() diff --git a/rush/c160001043.lua b/rush/c160001043.lua index 386212908e..94fdfb9bf6 100644 --- a/rush/c160001043.lua +++ b/rush/c160001043.lua @@ -1,5 +1,5 @@ --闇の訪れ ---Darkness Approaches (Rush Duel) +--Darkness Approaches (Rush) local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160001048.lua b/rush/c160001048.lua index 1883fd9384..7213959c07 100644 --- a/rush/c160001048.lua +++ b/rush/c160001048.lua @@ -1,5 +1,5 @@ --突風 ---Gust (Rush Duel) +--Gust (Rush) local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160001049.lua b/rush/c160001049.lua index dad189b6b0..03aa1a5356 100644 --- a/rush/c160001049.lua +++ b/rush/c160001049.lua @@ -1,5 +1,5 @@ --暴虐の報い ---Brutal Retributtion +--Brutal Retribution local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160001050.lua b/rush/c160001050.lua index 803c83150b..08ab37679c 100644 --- a/rush/c160001050.lua +++ b/rush/c160001050.lua @@ -1,5 +1,5 @@ --１アップ ---1 Up +--1-Up local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160002026.lua b/rush/c160002026.lua index eda2243172..c63d1a48df 100644 --- a/rush/c160002026.lua +++ b/rush/c160002026.lua @@ -1,5 +1,5 @@ --闘将ナンデス ---Nanes the Fire Awakener +--Nandes the Fire Awakener local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160002028.lua b/rush/c160002028.lua index 873557f20f..6c976bc4eb 100644 --- a/rush/c160002028.lua +++ b/rush/c160002028.lua @@ -1,5 +1,5 @@ --獣機界王カタパルト・デビルコング ---Beast Gear Emperor Catapult King +--Beast Gear Emperor Catapult Kong --Scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160002034.lua b/rush/c160002034.lua index d14d7f9aeb..cb24f36846 100644 --- a/rush/c160002034.lua +++ b/rush/c160002034.lua @@ -37,7 +37,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp,chk) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(tc:GetLevel()*100) c:RegisterEffect(e1) Duel.SendtoDeck(tc,nil,SEQ_DECKSHUFFLE,REASON_EFFECT) diff --git a/rush/c160003017.lua b/rush/c160003017.lua index 8bcf8bb4c6..8bb690d0d6 100644 --- a/rush/c160003017.lua +++ b/rush/c160003017.lua @@ -1,5 +1,5 @@ ---聖剣士の鞘払いシース ---Sheath the Scabbard of the Holy Swordsman +--聖剣士の鞘払いシース +--Sieth, the Scabbard of Noble Arms local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160003019.lua b/rush/c160003019.lua index 04ce94139b..a17b9d47b1 100644 --- a/rush/c160003019.lua +++ b/rush/c160003019.lua @@ -31,7 +31,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(atk*400) c:RegisterEffect(e1) end diff --git a/rush/c160003020.lua b/rush/c160003020.lua index a48d6f7c44..ac1aeb0f45 100644 --- a/rush/c160003020.lua +++ b/rush/c160003020.lua @@ -27,7 +27,7 @@ end --If this card was summoned from hand or GY this turn and check for 4+ dragons in your GY function s.drcon(e,tp,eg,ep,ev,re,r,rp) return Duel.IsExistingMatchingCard(Card.IsRace,tp,LOCATION_GRAVE,0,4,nil,RACE_DRAGON) - and e:GetHandler():GetFlagEffect(id)>0 and e:GetHandler():IsSummonLocation(LOCATION_HAND+LOCATION_GRAVE) + and e:GetHandler():GetFlagEffect(id)>0 and e:GetHandler():IsSummonLocation(LOCATION_HAND|LOCATION_GRAVE) end --Activation legality function s.drtg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/rush/c160003022.lua b/rush/c160003022.lua index ec7fd82738..096595154c 100644 --- a/rush/c160003022.lua +++ b/rush/c160003022.lua @@ -1,5 +1,5 @@ --クリア・アイス・ドラゴン ---Clear Ice Dragon +--Clear Ice Dragon --Scripted by Hatter local s,id=GetID() diff --git a/rush/c160003026.lua b/rush/c160003026.lua index b2d0b37dad..c18b434d36 100644 --- a/rush/c160003026.lua +++ b/rush/c160003026.lua @@ -1,6 +1,5 @@ --死魔将ケッシン ---Kesshin the Decided Death Demon General - +--Kesshin the Dark Decimator local s,id=GetID() function s.initial_effect(c) --Discard your entire hand, gain 600 ATK per sent card @@ -24,8 +23,8 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) - e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(600*#g) c:RegisterEffect(e1) end -end +end \ No newline at end of file diff --git a/rush/c160003027.lua b/rush/c160003027.lua index 898646c1b0..7528160851 100644 --- a/rush/c160003027.lua +++ b/rush/c160003027.lua @@ -1,5 +1,5 @@ -- メッシーホース ---Festivi-Sea Horse +--Seahorse Server local s,id=GetID() function s.initial_effect(c) --Gain LP diff --git a/rush/c160003028.lua b/rush/c160003028.lua index defc540d47..4f952a7ce4 100644 --- a/rush/c160003028.lua +++ b/rush/c160003028.lua @@ -1,5 +1,5 @@ --アッシーホース ---Assi-Sea Horse +--Seahorse Carrier local s,id=GetID() function s.initial_effect(c) --Send to GY and destroy diff --git a/rush/c160003029.lua b/rush/c160003029.lua index 23b2c1f918..1de2b4b381 100644 --- a/rush/c160003029.lua +++ b/rush/c160003029.lua @@ -1,5 +1,5 @@ --ヴィシュワ・ランバディ ---Vishwar Ranbuddy +--Vishwar Lambadi local s,id=GetID() function s.initial_effect(c) --Send to GY and destroy diff --git a/rush/c160003030.lua b/rush/c160003030.lua index 932d7d0a14..75d76d69f0 100644 --- a/rush/c160003030.lua +++ b/rush/c160003030.lua @@ -1,5 +1,5 @@ --獣機界トライク・フォックス ---Trike Fox of the Beast Gear World +--Beast Gear Trike Fox local s,id=GetID() function s.initial_effect(c) @@ -42,7 +42,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_OATH) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end end diff --git a/rush/c160003031.lua b/rush/c160003031.lua index 3e4afc7a5d..57ffdfa624 100644 --- a/rush/c160003031.lua +++ b/rush/c160003031.lua @@ -1,5 +1,5 @@ --獣機界覇者キングコンボイ・ライガオン ---King Convoy Ligeon, Conqueror of the Beast Gear World +--Beast Gear King Convoy Liogon local s,id=GetID() function s.initial_effect(c) @@ -31,7 +31,7 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(lv*100) c:RegisterEffect(e1) --Attack limit @@ -53,7 +53,7 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) e4:SetTargetRange(LOCATION_MZONE,0) e4:SetTarget(s.ftarget) e4:SetLabel(c:GetFieldID()) - e4:SetReset(RESET_PHASE+PHASE_END) + e4:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e4,tp) --Attack all local e5=Effect.CreateEffect(c) diff --git a/rush/c160003032.lua b/rush/c160003032.lua index 438ca25578..f62d05d78e 100644 --- a/rush/c160003032.lua +++ b/rush/c160003032.lua @@ -1,5 +1,5 @@ --- 特報マシン・タフロイド --- News Flash Machine Toughroid +-- 特報マシン・タフロイド +--Printing Presser local s,id=GetID() function s.initial_effect(c) --excavate diff --git a/rush/c160003033.lua b/rush/c160003033.lua index 3381a914f0..bbc97433c3 100644 --- a/rush/c160003033.lua +++ b/rush/c160003033.lua @@ -1,5 +1,5 @@ --火麺上忍カエダマゴックブート ---Masked Fiery Noodle Jonin Kaedama Gockboot +--Extra Spice the Elite Noodle Ninja local s,id=GetID() function s.initial_effect(c) --Gain ATK diff --git a/rush/c160003035.lua b/rush/c160003035.lua index 9a0e192d5f..c712259ebb 100644 --- a/rush/c160003035.lua +++ b/rush/c160003035.lua @@ -1,4 +1,4 @@ ---トリック・ピジョン +--トリック・ピジョン --Trick Pigeon local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160003036.lua b/rush/c160003036.lua index 0062831d03..d61afa29b7 100644 --- a/rush/c160003036.lua +++ b/rush/c160003036.lua @@ -1,4 +1,4 @@ ---ルミナス・パロット +--ルミナス・パロット --Luminous Parrot local s,id=GetID() diff --git a/rush/c160003037.lua b/rush/c160003037.lua index 421430380e..ad3b2579e9 100644 --- a/rush/c160003037.lua +++ b/rush/c160003037.lua @@ -1,4 +1,4 @@ ---ロング・シールド・ガードナー +--ロング・シールド・ガードナー --Long Shield Gardna local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160003038.lua b/rush/c160003038.lua index 9c4df87b8c..4a68b5bda8 100644 --- a/rush/c160003038.lua +++ b/rush/c160003038.lua @@ -1,5 +1,5 @@ --哨艇エルダイン ---Sentry Boat Eldrain +--Eldign Patrol Ship local s,id=GetID() function s.initial_effect(c) @@ -20,7 +20,7 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(s.tdfilter,tp,LOCATION_GRAVE,0,1,nil) end end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return Duel.IsExistingMatchingCard(Card.IsFacedown,tp,0,LOCATION_ONFIELD,1,nil) + if chk==0 then return Duel.IsExistingMatchingCard(Card.IsFacedown,tp,0,LOCATION_ONFIELD,1,nil) end end function s.operation(e,tp,eg,ep,ev,re,r,rp) @@ -31,7 +31,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) --Effect local g=Duel.SelectMatchingCard(tp,Card.IsFacedown,tp,0,LOCATION_ONFIELD,1,1,nil):GetFirst() Duel.HintSelection(Group.FromCards(g)) - if g and g:IsFacedown() then + if g and g:IsFacedown() then Duel.ConfirmCards(tp,g) end end diff --git a/rush/c160003041.lua b/rush/c160003041.lua index c4cf649dfd..66cfb5122b 100644 --- a/rush/c160003041.lua +++ b/rush/c160003041.lua @@ -1,5 +1,5 @@ --- 海竜王グランガノス Kairyu-Oh Granganoth ---Sea Dragon King Granganoth +-- 海竜王グランガノス Kairyu-Oh Granganoth +--Sea Dragon King Granganus local s,id=GetID() function s.initial_effect(c) --Pay LP to deal damage diff --git a/rush/c160003043.lua b/rush/c160003043.lua index f1db2a17df..8b60595306 100644 --- a/rush/c160003043.lua +++ b/rush/c160003043.lua @@ -1,5 +1,5 @@ --リターン・オブ・ドラゴン ---Return of Dragon +--Dragon's Return local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160003044.lua b/rush/c160003044.lua index d994308f93..86c0b6742c 100644 --- a/rush/c160003044.lua +++ b/rush/c160003044.lua @@ -1,5 +1,5 @@ --火中の栗 ---Chestnuts Out of the Fire +--Blazing Chestnut --Substitute ID local s,id=GetID() diff --git a/rush/c160003046.lua b/rush/c160003046.lua index 5e7e36f8d7..36fadf13ea 100644 --- a/rush/c160003046.lua +++ b/rush/c160003046.lua @@ -18,7 +18,7 @@ function s.filter(c) end --Activation legality function s.target(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsRace,RACE_PYRO),tp,LOCATION_MZONE,0,1,nil) + if chk==0 then return Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsRace,RACE_PYRO),tp,LOCATION_MZONE,0,1,nil) and Duel.IsExistingMatchingCard(s.filter,tp,0,LOCATION_MZONE,1,nil) end end diff --git a/rush/c160003048.lua b/rush/c160003048.lua index bceec5085c..5f0582af0b 100644 --- a/rush/c160003048.lua +++ b/rush/c160003048.lua @@ -1,5 +1,5 @@ -- 魅惑の不夜城 ---The Enchanted Nightless City +--Shining City Nights local s,id=GetID() function s.initial_effect(c) --activate diff --git a/rush/c160003050.lua b/rush/c160003050.lua index 9a1d9a6b5d..36cc321095 100644 --- a/rush/c160003050.lua +++ b/rush/c160003050.lua @@ -1,5 +1,5 @@ --大海洋 ---Big Ocean +--Big Umi --Scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160003053.lua b/rush/c160003053.lua index 47e646f562..6e957a0279 100644 --- a/rush/c160003053.lua +++ b/rush/c160003053.lua @@ -1,4 +1,5 @@ --森 +--Forest (Rush) local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160003055.lua b/rush/c160003055.lua index 4a8ac3ad1d..df966bbc5d 100644 --- a/rush/c160003055.lua +++ b/rush/c160003055.lua @@ -1,5 +1,5 @@ --キラー・バイトボール ---Killer Bite Ball +--Bait Bite Ball --Substitute ID local s,id=GetID() @@ -28,7 +28,7 @@ function s.atkfilter(c) end --Activation legality function s.target(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,0,LOCATION_MZONE,1,nil) + if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,0,LOCATION_MZONE,1,nil) and Duel.IsExistingMatchingCard(s.atkfilter,tp,LOCATION_MZONE,0,1,nil) end Duel.SetOperationInfo(0,CATEGORY_ATKCHANGE,nil,0,0,LOCATION_MZONE) end diff --git a/rush/c160003058.lua b/rush/c160003058.lua index 7daea654a9..8820f54f06 100644 --- a/rush/c160003058.lua +++ b/rush/c160003058.lua @@ -1,5 +1,5 @@ -- 強欲な大亀 --- Great Turtle of Greed +--Giant Tortoise of Greed local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160003059.lua b/rush/c160003059.lua index 20fa4ba490..29b5cccaf7 100644 --- a/rush/c160003059.lua +++ b/rush/c160003059.lua @@ -1,5 +1,5 @@ ---トリプル３ ---Triple 3 +--トリプル３ +--Triple Trio local s,id=GetID() function s.initial_effect(c) local e1=Effect.CreateEffect(c) diff --git a/rush/c160003060.lua b/rush/c160003060.lua index 33b854c52e..33acebf474 100644 --- a/rush/c160003060.lua +++ b/rush/c160003060.lua @@ -1,5 +1,5 @@ --背誤射撃 ---Rear Misfire +--Faulty Fire local s,id=GetID() function s.initial_effect(c) --Destroy 1 of opponent's level 6 or lower effect monsters diff --git a/rush/c160004000.lua b/rush/c160004000.lua index a29cad90e0..5ac8a254de 100644 --- a/rush/c160004000.lua +++ b/rush/c160004000.lua @@ -8,11 +8,11 @@ function s.initial_effect(c) e1:SetCode(EFFECT_CANNOT_TRIGGER) e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE) e1:SetRange(LOCATION_MZONE) - e1:SetTargetRange(0,0xa) + e1:SetTargetRange(0,LOCATION_HAND|LOCATION_SZONE) e1:SetTarget(aux.TargetBoolFunction(Card.IsTrap)) c:RegisterEffect(e1) local e2=e1:Clone() - e2:SetTargetRange(0xa,0) + e2:SetTargetRange(LOCATION_HAND|LOCATION_SZONE,0) e2:SetCondition(s.cond) c:RegisterEffect(e2) --cannot activate @@ -22,7 +22,7 @@ function s.initial_effect(c) e3:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e3:SetTargetRange(0,1) e3:SetValue(s.aclimit) - e3:SetReset(RESET_PHASE+PHASE_END) + e3:SetReset(RESET_PHASE|PHASE_END) c:RegisterEffect(e3) local e4=e3:Clone() e4:SetTargetRange(1,0) diff --git a/rush/c160004018.lua b/rush/c160004018.lua index 90bcb82db3..96f5b3ff01 100644 --- a/rush/c160004018.lua +++ b/rush/c160004018.lua @@ -1,5 +1,5 @@ --死反のタマ ---Soul of Death Reversal +--Tama the Mancer Cat local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160004019.lua b/rush/c160004019.lua index b3a0a8a0a6..0b739f5201 100644 --- a/rush/c160004019.lua +++ b/rush/c160004019.lua @@ -1,5 +1,5 @@ --祭神モドリーナ ---Enshrined Deity Modorina +--Modorina the Light Retriever local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160004020.lua b/rush/c160004020.lua index 1c3b41f2bb..d00fb977b9 100644 --- a/rush/c160004020.lua +++ b/rush/c160004020.lua @@ -1,5 +1,5 @@ ---魔将セメルーラ --- Fiendish Commander Semeruler +--魔将セメルーラ +--Semeruler the Dark Summoner local s,id=GetID() function s.initial_effect(c) --Special summon @@ -44,7 +44,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(tc:GetBaseDefense()) tc:RegisterEffect(e1) end diff --git a/rush/c160004021.lua b/rush/c160004021.lua index d04a6666a9..f784a6c9c0 100644 --- a/rush/c160004021.lua +++ b/rush/c160004021.lua @@ -1,5 +1,5 @@ -- 幻竜重騎ウォームＥｘカベーター ---Wurm Ex-Cavator the Heavy Mequestrian Wyrm (Left) +--Wyrm Excavator the Heavy Cavalry Draco [L] local s,id=GetID() function s.initial_effect(c) --atkup diff --git a/rush/c160004023.lua b/rush/c160004023.lua index e26daeeecb..f225a4c663 100644 --- a/rush/c160004023.lua +++ b/rush/c160004023.lua @@ -1,5 +1,5 @@ --幻竜重騎ウォームＥｘカベーター ---Wurm Ex-Cavator the Heavy Mequestrian Wyrm (Right) +--Wyrm Excavator the Heavy Cavalry Draco [R] local s,id=GetID() function s.initial_effect(c) local e1=Effect.CreateEffect(c) @@ -42,7 +42,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) Duel.Draw(tp,1,REASON_EFFECT) if sg:GetFirst():IsType(TYPE_FIELD) and Duel.IsPlayerCanDraw(tp,1) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then Duel.Draw(tp,1,REASON_EFFECT) - end + end end end end diff --git a/rush/c160004024.lua b/rush/c160004024.lua index 227b616da0..9da27540a9 100644 --- a/rush/c160004024.lua +++ b/rush/c160004024.lua @@ -1,5 +1,5 @@ -- 幻刃竜ビルド・ドラゴン --- Build Dragon the Mythic Sword Dragon +--Constructor Wyrm Buildragon local s,id=GetID() function s.initial_effect(c) --Special summon wyrm normal monster from GY diff --git a/rush/c160004025.lua b/rush/c160004025.lua index e197dc7596..532cf4fcc2 100644 --- a/rush/c160004025.lua +++ b/rush/c160004025.lua @@ -1,5 +1,5 @@ --幻刃妖精ピッケロン ---Pickelong the Mythic Sword Fairy +--Picklon the Constructor Fairy local s,id=GetID() function s.initial_effect(c) --Draw diff --git a/rush/c160004026.lua b/rush/c160004026.lua index 604c70c816..f3fee52c41 100644 --- a/rush/c160004026.lua +++ b/rush/c160004026.lua @@ -43,7 +43,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(atk*-500) tc:RegisterEffect(e1) local e2=e1:Clone() diff --git a/rush/c160004027.lua b/rush/c160004027.lua index 0a9c82b544..5c10ebfd87 100644 --- a/rush/c160004027.lua +++ b/rush/c160004027.lua @@ -1,5 +1,5 @@ --突楽姫トランペットンファー ---Trumpetonfa the Stabbing Music Maiden +--Trumpetonfa the Music Princess local s,id=GetID() function s.initial_effect(c) --ATK increase diff --git a/rush/c160004028.lua b/rush/c160004028.lua index 8f1985b191..43898f981a 100644 --- a/rush/c160004028.lua +++ b/rush/c160004028.lua @@ -1,5 +1,5 @@ --重楽鬼アンサンブルファイター ---Ensemble Fighter the Heavy Music Oni +--Ensembullfighter the Music Fiend local s,id=GetID() function s.initial_effect(c) --Prevent Tribute Summon diff --git a/rush/c160004029.lua b/rush/c160004029.lua index 0dcf479618..863dc61186 100644 --- a/rush/c160004029.lua +++ b/rush/c160004029.lua @@ -1,5 +1,5 @@ --神楽鬼ファーゴッド・フィンガー --- Bassoon Finger the Divine Music Oni +--Digisoon the Music Fiend local s,id=GetID() function s.initial_effect(c) local e1=Effect.CreateEffect(c) @@ -33,7 +33,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(atk*800) c:RegisterEffect(e1) end diff --git a/rush/c160004030.lua b/rush/c160004030.lua index 1363b30ee8..72a007f383 100644 --- a/rush/c160004030.lua +++ b/rush/c160004030.lua @@ -1,5 +1,5 @@ --特上寿司天使ガリブエル ---Garibel the Extra Premium Sushi Angel +--Gingangel, the Deluxe Sushi Fairy local s,id=GetID() function s.initial_effect(c) @@ -49,7 +49,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) e1:SetLabel(c:GetFieldID()) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end end diff --git a/rush/c160004034.lua b/rush/c160004034.lua index 7e9817e256..4c54b45dae 100644 --- a/rush/c160004034.lua +++ b/rush/c160004034.lua @@ -1,5 +1,5 @@ ---アンマグマ ---Massage Magrrma +--アンマグマ +--Anmagmabear local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160004035.lua b/rush/c160004035.lua index 16581c2a0e..4760a245d7 100644 --- a/rush/c160004035.lua +++ b/rush/c160004035.lua @@ -1,5 +1,5 @@ ---アロマグマ ---Aromagrrma +--アロマグマ +--Aromagmabear local s,id=GetID() function s.initial_effect(c) --Gain LP diff --git a/rush/c160004037.lua b/rush/c160004037.lua index ca205b6713..4125d2b9fa 100644 --- a/rush/c160004037.lua +++ b/rush/c160004037.lua @@ -1,5 +1,5 @@ --マグマックス・マントルヴェーダ ---Magmax Mantle-Ayurveda +--Magmax Mantleveda local s,id=GetID() function s.initial_effect(c) @@ -18,7 +18,7 @@ end function s.costfilter(c,tp) return c:IsMonster() and c:IsRace(RACE_PYRO) and c:IsAbleToGraveAsCost() - and Duel.IsExistingMatchingCard(s.desfilter,tp,0,LOCATION_MZONE,1,nil,c:GetLevel()) + and Duel.IsExistingMatchingCard(s.desfilter,tp,0,LOCATION_MZONE,1,nil,c:GetLevel()) end function s.desfilter(c,lvl) return c:IsMonster() and c:IsPosition(POS_FACEUP_DEFENSE) and c:IsLevel(lvl) diff --git a/rush/c160004038.lua b/rush/c160004038.lua index d5317194a2..da10072fed 100644 --- a/rush/c160004038.lua +++ b/rush/c160004038.lua @@ -1,5 +1,5 @@ --陰陽士サカカゼ ---Onmyou Warrior Sakakaze +--Sakakaze the Talismanic Warrior local s,id=GetID() function s.initial_effect(c) --shuffle to deck diff --git a/rush/c160004040.lua b/rush/c160004040.lua index 667e2b1cd3..cd41bbc721 100644 --- a/rush/c160004040.lua +++ b/rush/c160004040.lua @@ -1,5 +1,5 @@ +--エンシェント・バリア --Ancient Barrier - local s,id=GetID() function s.initial_effect(c) -- activate diff --git a/rush/c160004041.lua b/rush/c160004041.lua index 26efafdd46..4e9930527b 100644 --- a/rush/c160004041.lua +++ b/rush/c160004041.lua @@ -1,5 +1,5 @@ --悪星の導き --- Evil Star's Guidance +--Evil Star Beacon local s,id=GetID() function s.initial_effect(c) --Activate @@ -49,7 +49,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e2:SetProperty(EFFECT_FLAG_OATH) e2:SetTargetRange(LOCATION_MZONE,0) e2:SetTarget(s.ftarget) - e2:SetReset(RESET_PHASE+PHASE_END) + e2:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e2,tp) end function s.ftarget(e,c) diff --git a/rush/c160004042.lua b/rush/c160004042.lua index 1868100482..1c587e1902 100644 --- a/rush/c160004042.lua +++ b/rush/c160004042.lua @@ -1,5 +1,5 @@ --透幻郷の嶮峻 ---The Insurmountable Summit of Spectral Shangri-La +--Peaks of Blisstopia local s,id=GetID() function s.initial_effect(c) --activate diff --git a/rush/c160004044.lua b/rush/c160004044.lua index a98a7cd3f9..8b1edd3a29 100644 --- a/rush/c160004044.lua +++ b/rush/c160004044.lua @@ -1,5 +1,5 @@ --始幻の咆哮 ---Roar of the First Fantasy +--Primal Howling local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160004045.lua b/rush/c160004045.lua index 867e9a93ea..ced70ba4a8 100644 --- a/rush/c160004045.lua +++ b/rush/c160004045.lua @@ -1,5 +1,5 @@ -- 楽姫の息吹 --- Breath of the Music Maidens +--Music Princess's Breath local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160004046.lua b/rush/c160004046.lua index 4c91e79161..40a883e665 100644 --- a/rush/c160004046.lua +++ b/rush/c160004046.lua @@ -1,5 +1,5 @@ --- 重騎屋戦法 --- Heavy Mequestrian Tactics +-- 重騎屋戦法 +--Heavy Cavalry Tactics local s,id=GetID() function s.initial_effect(c) --Activate @@ -46,7 +46,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) e1:SetLabel(g:GetFirst():GetFieldID()) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end end diff --git a/rush/c160004047.lua b/rush/c160004047.lua index 47387be5a9..6b064cf4df 100644 --- a/rush/c160004047.lua +++ b/rush/c160004047.lua @@ -1,5 +1,5 @@ -- 世紀末獣戦士伝説 ---Post-Apocalyptic Beast-Warrior Legend +--Apocalypse - Legend of the Warrior local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160004051.lua b/rush/c160004051.lua index 50b0613cb4..79798b56d0 100644 --- a/rush/c160004051.lua +++ b/rush/c160004051.lua @@ -26,7 +26,7 @@ function s.condition(e,tp,eg,ep,ev,re,r,rp) return eg:IsExists(s.filter,1,nil,e,tp) and Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_GRAVE,0,1,nil,tp) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return + if chk==0 then return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_GRAVE,0,1,nil,tp) end Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,3,tp,LOCATION_GRAVE) diff --git a/rush/c160004053.lua b/rush/c160004053.lua index 9f7c2a7290..b5f035b31a 100644 --- a/rush/c160004053.lua +++ b/rush/c160004053.lua @@ -1,8 +1,10 @@ +--幻刃急攻 --Constructor Ambush local s,id=GetID() function s.initial_effect(c) --Decrease ATK local e1=Effect.CreateEffect(c) + e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_ATKCHANGE) e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetCode(EVENT_ATTACK_ANNOUNCE) diff --git a/rush/c160004055.lua b/rush/c160004055.lua index a01c35d59d..cd437c4d13 100644 --- a/rush/c160004055.lua +++ b/rush/c160004055.lua @@ -1,4 +1,4 @@ ---重騎起動装置 +--重騎起動装置 --Heavy Cavalry Starter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160004056.lua b/rush/c160004056.lua index c09d7cd33e..afb3be2f7f 100644 --- a/rush/c160004056.lua +++ b/rush/c160004056.lua @@ -1,5 +1,5 @@ --ジャイアント革命 ---Gi-Ant Revolution +--Gi-ant Revolution --scripted by edo9300 local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160004057.lua b/rush/c160004057.lua index 034e4b9b3f..aef7d58a05 100644 --- a/rush/c160004057.lua +++ b/rush/c160004057.lua @@ -1,5 +1,5 @@ ---アリバティ・フラッグ ---Libanty Flag +--アリバティ・フラッグ +--Antiberty Flag --Scripted by edo9300 local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160004060.lua b/rush/c160004060.lua index fb9ad9fc7d..bd866f6303 100644 --- a/rush/c160004060.lua +++ b/rush/c160004060.lua @@ -1,5 +1,5 @@ --獣機界奥義 獣之拳 ---Beast Gear World Secret Technique – Fist of the Beast +--Beast Gear Secret Art - Primal Fist --Scripted by The Razgriz local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160005000.lua b/rush/c160005000.lua index 9be9016da3..e1fc17dbff 100644 --- a/rush/c160005000.lua +++ b/rush/c160005000.lua @@ -12,5 +12,5 @@ function s.initial_effect(c) c:RegisterEffect(e1) end function s.val(e,c) - return Duel.GetMatchingGroupCountRush(aux.FaceupFilter(Card.IsRace,RACE_DRAGON),c:GetControler(),0,LOCATION_MZONE+LOCATION_GRAVE,nil)*500 + return Duel.GetMatchingGroupCountRush(aux.FaceupFilter(Card.IsRace,RACE_DRAGON),c:GetControler(),0,LOCATION_MZONE|LOCATION_GRAVE,nil)*500 end \ No newline at end of file diff --git a/rush/c160005013.lua b/rush/c160005013.lua index b0c67ef786..d0aa7e3212 100644 --- a/rush/c160005013.lua +++ b/rush/c160005013.lua @@ -40,7 +40,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local g=Duel.SelectMatchingCard(tp,s.rthfilter,tp,0,LOCATION_ONFIELD,1,1,nil) if #g<1 then return end Duel.HintSelection(g) - if Duel.SendtoHand(g,nil,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,1,nil) + if Duel.SendtoHand(g,nil,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then local g2=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,1,1,nil) if #g2>0 then diff --git a/rush/c160005017.lua b/rush/c160005017.lua index 9b5579a611..329ec5fbc5 100644 --- a/rush/c160005017.lua +++ b/rush/c160005017.lua @@ -1,5 +1,5 @@ +--執念の竜 --Fortitude Dragon - local s,id=GetID() function s.initial_effect(c) --Make 1 of opponent's monsters lose 400 ATK @@ -21,8 +21,8 @@ function s.filter(c) return c:IsFaceup() and c:IsAttackAbove(2000) and c:IsNotMaximumModeSide() end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return - Duel.IsExistingMatchingCard(s.filter,tp,0,LOCATION_MZONE,1,nil) + if chk==0 then return + Duel.IsExistingMatchingCard(s.filter,tp,0,LOCATION_MZONE,1,nil) end end function s.sfilter(c) diff --git a/rush/c160005018.lua b/rush/c160005018.lua index bf5acffc11..117f56c303 100644 --- a/rush/c160005018.lua +++ b/rush/c160005018.lua @@ -1,5 +1,5 @@ --アンドール ---Andoll +--Endoll local s,id=GetID() function s.initial_effect(c) --Set cards diff --git a/rush/c160005019.lua b/rush/c160005019.lua index ec2d6373bc..5645ffcc53 100644 --- a/rush/c160005019.lua +++ b/rush/c160005019.lua @@ -1,5 +1,5 @@ -- ＣＡＮ－Ｒｅ：Ｄ ---CAN-Re:D +--CAN - Re:D local s,id=GetID() function s.initial_effect(c) --deal damage @@ -31,7 +31,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetRange(LOCATION_MZONE) e1:SetCode(EFFECT_CANNOT_SUMMON) e1:SetTarget(s.sumlimit) - e1:SetReset(RESET_PHASE+PHASE_END+RESET_OPPO_TURN,1) + e1:SetReset(RESET_PHASE|PHASE_END|RESET_OPPO_TURN,1) e1:SetTargetRange(1,0) c:RegisterEffect(e1) end diff --git a/rush/c160005020.lua b/rush/c160005020.lua index cfa9f53e62..d0f954480b 100644 --- a/rush/c160005020.lua +++ b/rush/c160005020.lua @@ -1,5 +1,5 @@ --魔将分隊 武組 ---Takegumi of the Fiendish Commander Squad +--Takegumi the Ruler's Squad local s,id=GetID() function s.initial_effect(c) --Make 1 of your winged beast monsters gain 1000 ATK diff --git a/rush/c160005021.lua b/rush/c160005021.lua index f160a66d38..65fbdcfe89 100644 --- a/rush/c160005021.lua +++ b/rush/c160005021.lua @@ -1,5 +1,5 @@ --和仮真戦士 ---Tranquil Unknown Soldier +--Wondering Warrior local s,id=GetID() function s.initial_effect(c) --Special summon diff --git a/rush/c160005022.lua b/rush/c160005022.lua index 34f333d4ae..73ae97effe 100644 --- a/rush/c160005022.lua +++ b/rush/c160005022.lua @@ -1,5 +1,5 @@ --- 魔仙斗アイスザーク --- Demonic Hermit Vessel Icezark +-- 魔仙斗アイスザーク +--Icezark the Unequaled local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160005023.lua b/rush/c160005023.lua index f251522abe..ae624ab46a 100644 --- a/rush/c160005023.lua +++ b/rush/c160005023.lua @@ -1,5 +1,5 @@ --ロイヤルデモンズ・フェイザー ---Royal Demon’s Phaser +--Royal Rebel's Phaser local s,id=GetID() function s.initial_effect(c) --Special summon diff --git a/rush/c160005025.lua b/rush/c160005025.lua index 0774814b5d..65d52981fe 100644 --- a/rush/c160005025.lua +++ b/rush/c160005025.lua @@ -1,4 +1,4 @@ ---バイス・ジャッカー +--バイス・ジャッカー -- Vice Jacker local s,id=GetID() function s.initial_effect(c) @@ -24,7 +24,7 @@ end function s.operation(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() --Requirement - Duel.PayLPCost(tp,1000) + Duel.PayLPCost(tp,1000) --Effect Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP) local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_MZONE,0,1,1,nil) diff --git a/rush/c160005026.lua b/rush/c160005026.lua index 41b701fc4f..2b19c67244 100644 --- a/rush/c160005026.lua +++ b/rush/c160005026.lua @@ -1,3 +1,3 @@ --監獄の神 ディアン・ケト ---Dian Keto the Prison Master +--Dian Keto the Security Master Duel.LoadCardScriptAlias(160403002) diff --git a/rush/c160005027.lua b/rush/c160005027.lua index 59af0e03a1..ba6ebe18fd 100644 --- a/rush/c160005027.lua +++ b/rush/c160005027.lua @@ -1,5 +1,5 @@ --花牙僧のミモザ ---Flower Fang Monk Mimosa +--Acacia the Shadow Flower Priestess local s,id=GetID() function s.initial_effect(c) --Position change diff --git a/rush/c160005028.lua b/rush/c160005028.lua index 7de12f42f5..d65b3da4c6 100644 --- a/rush/c160005028.lua +++ b/rush/c160005028.lua @@ -1,5 +1,5 @@ --花牙美人のゲッカ ---Flower Fang Beauty Gekka +--Gekka the Shadow Flower Beauty local s,id=GetID() function s.initial_effect(c) --Send to GY and destroy diff --git a/rush/c160005029.lua b/rush/c160005029.lua index 7af8ca6ee4..d997c34cc5 100644 --- a/rush/c160005029.lua +++ b/rush/c160005029.lua @@ -1,5 +1,5 @@ --花牙クノイチ・エトランゼ ---Flower Fang Kunoichi Etranzer +--Etraynze the Shadow Flower Ninja local s,id=GetID() function s.initial_effect(c) --Special summon @@ -46,7 +46,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP) local tc=g:GetFirst() local fid=c:GetFieldID() - tc:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD,0,1,fid) + tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD,0,1,fid) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) diff --git a/rush/c160005030.lua b/rush/c160005030.lua index ebe47f6531..2120902c27 100644 --- a/rush/c160005030.lua +++ b/rush/c160005030.lua @@ -1,5 +1,5 @@ ---花牙蘭獅子ガジュウ丸 ---Gajuumaru the Shadow Flower Lion +--花牙蘭獅子ガジュウ丸 +--Gajumaru the Shadow Flower Lion local s,id=GetID() function s.initial_effect(c) --Targeted monster loses ATK @@ -20,7 +20,7 @@ function s.filter(c) return c:IsFaceup() and c:GetBaseAttack()>0 and c:IsLevelBelow(8) and c:IsAttribute(ATTRIBUTE_EARTH) and c:IsNotMaximumModeSide() end function s.destg(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return Duel.IsExistingMatchingCard(s.costfilter,tp,LOCATION_MZONE,0,1,e:GetHandler()) + if chk==0 then return Duel.IsExistingMatchingCard(s.costfilter,tp,LOCATION_MZONE,0,1,e:GetHandler()) and Duel.IsExistingMatchingCard(s.filter,tp,0,LOCATION_MZONE,1,nil) end end function s.desop(e,tp,eg,ep,ev,re,r,rp) diff --git a/rush/c160005031.lua b/rush/c160005031.lua index c87849101d..9020833e9b 100644 --- a/rush/c160005031.lua +++ b/rush/c160005031.lua @@ -1,5 +1,5 @@ --真花牙クノイチ・ガーランド ---True Flower Fang Kunoichi Garrand +--Garland the True Shadow Flower Ninja local s,id=GetID() function s.initial_effect(c) --Special summon @@ -43,7 +43,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP) local tc=g:GetFirst() local fid=c:GetFieldID() - tc:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD,0,1,fid) + tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD,0,1,fid) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) diff --git a/rush/c160005032.lua b/rush/c160005032.lua index 41b3aa7e88..7c6adffdde 100644 --- a/rush/c160005032.lua +++ b/rush/c160005032.lua @@ -1,5 +1,5 @@ -- 花牙シノビ・ガトリング ---Flower Fang Shinobi Gatring +--Gatling the Shadow Flower Shinobi local s,id=GetID() function s.initial_effect(c) --Destroy 2 of opponent's monsters @@ -50,14 +50,14 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetCondition(s.atkcon) e1:SetTarget(s.atktg) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) local e2=Effect.CreateEffect(e:GetHandler()) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e2:SetCode(EVENT_ATTACK_ANNOUNCE) e2:SetOperation(s.checkop) - e2:SetReset(RESET_PHASE+PHASE_END) + e2:SetReset(RESET_PHASE|PHASE_END) e2:SetLabelObject(e1) Duel.RegisterEffect(e2,tp) end diff --git a/rush/c160005034.lua b/rush/c160005034.lua index 9f1cd76d6f..6b7699f1a0 100644 --- a/rush/c160005034.lua +++ b/rush/c160005034.lua @@ -1,5 +1,5 @@ -- 幻書鳩の騎士ナイト・ヴィジョン --- Phantom Dove Night Vision +--Night Vision the Phantom Pigeon local s,id=GetID() function s.initial_effect(c) --gain atk @@ -33,7 +33,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(ct*200) c:RegisterEffect(e1) if ct>4 then diff --git a/rush/c160005035.lua b/rush/c160005035.lua index f7b99a3943..af3018a0a6 100644 --- a/rush/c160005035.lua +++ b/rush/c160005035.lua @@ -1,8 +1,10 @@ +--シエスタトレーロ --Siesta Torero local s,id=GetID() function s.initial_effect(c) --change position local e1=Effect.CreateEffect(c) + e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_POSITION) e1:SetType(EFFECT_TYPE_IGNITION) e1:SetRange(LOCATION_MZONE) diff --git a/rush/c160005036.lua b/rush/c160005036.lua index 80ab8763b4..b53d9282a4 100644 --- a/rush/c160005036.lua +++ b/rush/c160005036.lua @@ -1,4 +1,4 @@ ---マジニカル・ミラクル +--マジニカル・ミラクル --Maginical Miracle local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160005037.lua b/rush/c160005037.lua index 00a59d0efd..adfb532083 100644 --- a/rush/c160005037.lua +++ b/rush/c160005037.lua @@ -1,8 +1,10 @@ +--豊沃の蟠竜 --Coiled Dragon of Fertility local s,id=GetID() function s.initial_effect(c) --deal damage local e1=Effect.CreateEffect(c) + e1:SetDescription(aux.Stringid(id,0)) e1:SetType(EFFECT_TYPE_IGNITION) e1:SetCategory(CATEGORY_DAMAGE) e1:SetRange(LOCATION_MZONE) diff --git a/rush/c160005039.lua b/rush/c160005039.lua index bcdfb737ef..6b58677c6a 100644 --- a/rush/c160005039.lua +++ b/rush/c160005039.lua @@ -45,7 +45,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(1500) tc:RegisterEffect(e1) end diff --git a/rush/c160005041.lua b/rush/c160005041.lua index ef3da2834f..09fed24ac8 100644 --- a/rush/c160005041.lua +++ b/rush/c160005041.lua @@ -1,5 +1,5 @@ --ロイヤルデモンズ・コマンド ---Royal Demon's Command +--Royal Rebel's Command local s,id=GetID() function s.initial_effect(c) --Increase ATK diff --git a/rush/c160005042.lua b/rush/c160005042.lua index df6a59c676..70e0c8b2ed 100644 --- a/rush/c160005042.lua +++ b/rush/c160005042.lua @@ -1,5 +1,5 @@ --ロイヤルデモンズ・ライブアリーナ --- Royal Demon's Live Arena +--Royal Rebel's Arena local s,id=GetID() function s.initial_effect(c) --activate diff --git a/rush/c160005043.lua b/rush/c160005043.lua index 3745ce9b5c..f3fdd71c11 100644 --- a/rush/c160005043.lua +++ b/rush/c160005043.lua @@ -1,5 +1,5 @@ --セツリの流転 ---Vicissitude of Providence +--Transmigration of Curiosity local s,id=GetID() function s.initial_effect(c) --Shuffle 4 monsters into the deck to draw 1 diff --git a/rush/c160005044.lua b/rush/c160005044.lua index 156c07aca9..4ffd1c4766 100644 --- a/rush/c160005044.lua +++ b/rush/c160005044.lua @@ -1,5 +1,5 @@ -- 天帝の威眼 ---The Menacing Eyes of the Heavenly Emperor +--Mighty Gaze of the Sky Emperor local s,id=GetID() function s.initial_effect(c) --Position change diff --git a/rush/c160005045.lua b/rush/c160005045.lua index 88d81ae077..33c9a83af4 100644 --- a/rush/c160005045.lua +++ b/rush/c160005045.lua @@ -1,5 +1,5 @@ --- 監獄島アネ・ゴ ・ロック --- Prison Island Ane Go Rock +-- 監獄島アネ・ゴ ・ロック +--Prison Island - Cell Block 5 & 6 local s,id=GetID() function s.initial_effect(c) --activate diff --git a/rush/c160005047.lua b/rush/c160005047.lua index 188b76b720..be40734012 100644 --- a/rush/c160005047.lua +++ b/rush/c160005047.lua @@ -1,5 +1,5 @@ ---水分補給 ---Moisturize +--水分補給 +--Hydration local s,id=GetID() function s.initial_effect(c) --heal and destroy @@ -24,7 +24,7 @@ function s.rectg(e,tp,eg,ep,ev,re,r,rp,chk) end function s.recop(e,tp,eg,ep,ev,re,r,rp) local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) - if Duel.Recover(p,d,REASON_EFFECT)>0 then + if Duel.Recover(p,d,REASON_EFFECT)>0 then local dg=Duel.GetMatchingGroup(Card.IsSpellTrap,tp,0,LOCATION_ONFIELD,nil) if #dg>0 and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then local sg=dg:Select(tp,1,1,nil) diff --git a/rush/c160005048.lua b/rush/c160005048.lua index 837532767c..dfdf777032 100644 --- a/rush/c160005048.lua +++ b/rush/c160005048.lua @@ -1,5 +1,5 @@ --花牙胞子 ---Flower Fang Spores +--Shadow Flower Spore --Scripted by The Razgriz local s,id=GetID() function s.initial_effect(c) @@ -41,7 +41,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP) local tc=g:GetFirst() local fid=c:GetFieldID() - tc:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD,0,1,fid) + tc:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD,0,1,fid) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) diff --git a/rush/c160005049.lua b/rush/c160005049.lua index bf219a8f43..4ff584b0b1 100644 --- a/rush/c160005049.lua +++ b/rush/c160005049.lua @@ -1,5 +1,5 @@ -- 不屈の世紀末獣戦士 ---The Indomitable Post-Apocalyptic Beast-Warrior +--Apocalypse - The Unstoppable Beast-Warrior local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160005050.lua b/rush/c160005050.lua index bf967ea189..70bfe5e0af 100644 --- a/rush/c160005050.lua +++ b/rush/c160005050.lua @@ -1,5 +1,5 @@ --- 魔迅雷 --- Majinrai, the Magical Lightning +-- 魔迅雷 +--Majinrai, the Striking Storm local s,id=GetID() function s.initial_effect(c) --Activate @@ -22,10 +22,10 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(s.costfilter,tp,LOCATION_HAND,0,1,e:GetHandler()) end end function s.filter(c) - return c:IsRace(RACE_FIEND) and c:IsLevelAbove(7) and c:IsType(TYPE_NORMAL) and c:IsFaceup() + return c:IsRace(RACE_FIEND) and c:IsLevelAbove(7) and c:IsType(TYPE_NORMAL) and c:IsFaceup() end function s.condition(e,tp,eg,ep,ev,re,r,rp) - return + return (Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsCode,CARD_SUMMONED_SKULL),tp,LOCATION_MZONE,0,1,nil) or Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_MZONE,0,1,nil)) diff --git a/rush/c160005053.lua b/rush/c160005053.lua index 7a6b1717d1..1f510f0b79 100644 --- a/rush/c160005053.lua +++ b/rush/c160005053.lua @@ -1,5 +1,5 @@ --鳥呪戦術 ---Avian Spell Strategy +--Avian Spell Tactics local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160005055.lua b/rush/c160005055.lua index 221cb254c1..96eec9387f 100644 --- a/rush/c160005055.lua +++ b/rush/c160005055.lua @@ -1,4 +1,4 @@ ---美☆魔女封じ +--美☆魔女封じ -- Pretty☆Witch Imprisonment local s,id=GetID() diff --git a/rush/c160005056.lua b/rush/c160005056.lua index 707a598b36..c82dd35bc7 100644 --- a/rush/c160005056.lua +++ b/rush/c160005056.lua @@ -1,5 +1,5 @@ ---水の泡－崩壊のバブル－ --- All For Naught -Bubble Burst- +--水の泡－崩壊のバブル－ +--All For Naught - Bubble Burst local s,id=GetID() function s.initial_effect(c) --Opponent's attacking monster loses ATK diff --git a/rush/c160005057.lua b/rush/c160005057.lua index 8c2cb81ec4..d7542afe3d 100644 --- a/rush/c160005057.lua +++ b/rush/c160005057.lua @@ -1,5 +1,5 @@ -- 花牙踏み ---Flower Fang Shadow Strike +--Shadow Flower Stance local s,id=GetID() function s.initial_effect(c) @@ -16,7 +16,7 @@ function s.initial_effect(c) c:RegisterEffect(e1) end function s.condition(e,tp,eg,ep,ev,re,r,rp) - local tc=Duel.GetAttackTarget() + local tc=Duel.GetAttackTarget() return tc and tc:IsFaceup() and tc:IsControler(tp) and tc:IsRace(RACE_PLANT) and Duel.GetAttacker():IsCanChangePositionRush() end function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/rush/c160005058.lua b/rush/c160005058.lua index bc58dfc86a..1d6e7b9aab 100644 --- a/rush/c160005058.lua +++ b/rush/c160005058.lua @@ -1,5 +1,5 @@ -- 花牙舞戻り --- Flower Fang Comeback +--Shadow Flower Return local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160005059.lua b/rush/c160005059.lua index 1232b6cf7f..77a8512491 100644 --- a/rush/c160005059.lua +++ b/rush/c160005059.lua @@ -1,5 +1,5 @@ -- ハートブレイクルック --- Heartbreak Look +--Brocoohearted Pigeon local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160005060.lua b/rush/c160005060.lua index 2466d03c0b..3adeec5acc 100644 --- a/rush/c160005060.lua +++ b/rush/c160005060.lua @@ -1,5 +1,5 @@ -- ハート道化 --- Clown Clock Heart +--Clowning Cookoo Clock local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160005061.lua b/rush/c160005061.lua index f0b09811a9..9f121f269f 100644 --- a/rush/c160005061.lua +++ b/rush/c160005061.lua @@ -1,5 +1,5 @@ --楽姫の独演 ---Music Maiden's Solo Performance +--Music Princess's Recital local s,id=GetID() function s.initial_effect(c) --Negate opponent monster's attack diff --git a/rush/c160005062.lua b/rush/c160005062.lua index 709fd662d2..726b1a1d19 100644 --- a/rush/c160005062.lua +++ b/rush/c160005062.lua @@ -1,5 +1,5 @@ --デーモンのじゅにく --- Archfiend's Incarnation +--Archfiend's Revival local s,id=GetID() function s.initial_effect(c) @@ -16,8 +16,8 @@ function s.initial_effect(c) end s.listed_names={CARD_SUMMONED_SKULL} function s.filter(c,tp) - return c:GetReasonPlayer()==1-tp and c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_MZONE) - and c:IsType(TYPE_NORMAL) + return c:GetReasonPlayer()==1-tp and c:IsPreviousControler(tp) and c:IsPreviousLocation(LOCATION_MZONE) + and c:IsType(TYPE_NORMAL) and (c:IsCode(CARD_SUMMONED_SKULL) or (c:IsRace(RACE_FIEND) and c:IsLevelAbove(7))) and (c:IsReason(REASON_BATTLE) and Duel.GetAttacker():IsControler(1-tp)) end diff --git a/rush/c160005063.lua b/rush/c160005063.lua index 06fd962522..e328ee8c21 100644 --- a/rush/c160005063.lua +++ b/rush/c160005063.lua @@ -1,5 +1,5 @@ --魔雷冥 ---Maraimei, the Dark Fire +--Maraimei, the Igniting Inferno local s,id=GetID() function s.initial_effect(c) --When your opponent normal/special summons a monster, take damage and shuffle monsters from the GY diff --git a/rush/c160005064.lua b/rush/c160005064.lua index f79a541296..55a2ed3618 100644 --- a/rush/c160005064.lua +++ b/rush/c160005064.lua @@ -1,5 +1,5 @@ --- 草葉エール --- Laughing Grass +-- 草葉エール +--Cheering Grass local s,id=GetID() function s.initial_effect(c) --If opponent normal summons, special summon 1 plant monster from hand diff --git a/rush/c160005065.lua b/rush/c160005065.lua index 7c7cf5bb44..2ed3403402 100644 --- a/rush/c160005065.lua +++ b/rush/c160005065.lua @@ -1,4 +1,4 @@ --- 酢酸のたまった落とし穴 +-- 酢酸のたまった落とし穴 -- Acetic Acid Trap Hole local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160006014.lua b/rush/c160006014.lua index 44a8d0a6ac..6720569821 100644 --- a/rush/c160006014.lua +++ b/rush/c160006014.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) end s.listed_names={CARD_SEVENS_ROAD_MAGICIAN} function s.cfilter(c,e,tp) - return c:IsAbleToGraveAsCost() + return c:IsAbleToGraveAsCost() end function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_HAND,0,1,e:GetHandler(),e,tp) end diff --git a/rush/c160006015.lua b/rush/c160006015.lua index f953cc7be4..49bc5b493c 100644 --- a/rush/c160006015.lua +++ b/rush/c160006015.lua @@ -1,5 +1,5 @@ --火雷神サンダーボールド ---Thunderbold the Lightningfire Deity +--Thunderbold, the Blazing Thunder local s,id=GetID() function s.initial_effect(c) --Increase ATK diff --git a/rush/c160006020.lua b/rush/c160006020.lua index 090ab6b30f..df2dd874ec 100644 --- a/rush/c160006020.lua +++ b/rush/c160006020.lua @@ -1,4 +1,4 @@ ---和平の刺者 +--和平の刺者 --Betrayer of Peace local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160006021.lua b/rush/c160006021.lua index d8d285b991..d2199925e3 100644 --- a/rush/c160006021.lua +++ b/rush/c160006021.lua @@ -1,4 +1,5 @@ ---仙斗カーチスザーク Masento Kachisuzaku (Demonic Hermit Vessel Kachisuzaku) +--魔仙斗カーチスザーク +--Karchizark the Unequaled local s,id=GetID() function s.initial_effect(c) --Gain LP diff --git a/rush/c160006023.lua b/rush/c160006023.lua index ff0dcea7cb..84a3d04567 100644 --- a/rush/c160006023.lua +++ b/rush/c160006023.lua @@ -1,7 +1,8 @@ -- SPシャイン・ガード Shining SP Corporate Guard +--Secret Service Shine Guard local s,id=GetID() function s.initial_effect(c) - -- Set + -- Set local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_LEAVE_GRAVE) @@ -56,7 +57,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_OATH) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end end diff --git a/rush/c160006024.lua b/rush/c160006024.lua index 9689f24f3b..2d95cdf036 100644 --- a/rush/c160006024.lua +++ b/rush/c160006024.lua @@ -1,8 +1,8 @@ --- 暗黒シャイン王アークトーク --- Shining Black Corporate King Arktalk the Corrupt +-- 暗黒シャイン王アークトーク +--Worker Warrior - Sinister CEO local s,id=GetID() function s.initial_effect(c) - -- Set + -- Set local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_LEAVE_GRAVE) diff --git a/rush/c160006026.lua b/rush/c160006026.lua index 94ff3db595..92495f1740 100644 --- a/rush/c160006026.lua +++ b/rush/c160006026.lua @@ -1,5 +1,5 @@ --獣騎動メガ・エレファント ---Mega Elephant the Mobile Beast Cavalry +--Beast Drive Mega Elephant local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160006027.lua b/rush/c160006027.lua index f57a049d13..50aaf736e7 100644 --- a/rush/c160006027.lua +++ b/rush/c160006027.lua @@ -1,5 +1,5 @@ -- ドグーチェ・ラングドシャコウキ --- Dogulce Langue de Chakoki +--Dogulce Langue de Shakoki -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160006028.lua b/rush/c160006028.lua index ca790b22e2..ad55abe9a2 100644 --- a/rush/c160006028.lua +++ b/rush/c160006028.lua @@ -1,5 +1,5 @@ -- ドキドキ・ヘクセンハウス --- Dokidoki Hexenhaus +--Doki Doki Hexenhaus -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160006029.lua b/rush/c160006029.lua index 05f938abec..c0f0a5dda5 100644 --- a/rush/c160006029.lua +++ b/rush/c160006029.lua @@ -1,5 +1,5 @@ -- 花牙祭のジャスミン --- Flower Fang Festival Jasmine +--Jasmine the Shadow Flower Festival -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160006031.lua b/rush/c160006031.lua index b45168d3d7..bfa13e958b 100644 --- a/rush/c160006031.lua +++ b/rush/c160006031.lua @@ -1,5 +1,5 @@ ---アサルト・アルマート ---Assault Armato +--アサルト・アルマート +--Assault Cannon local s,id=GetID() function s.initial_effect(c) --Make 1 of opponent's monsters lose 300 ATK/DEF diff --git a/rush/c160006034.lua b/rush/c160006034.lua index 4fb7ffb833..d3ec264dec 100644 --- a/rush/c160006034.lua +++ b/rush/c160006034.lua @@ -30,7 +30,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(500) c:RegisterEffect(e1) end diff --git a/rush/c160006035.lua b/rush/c160006035.lua index 160243ca4f..3b3bf31706 100644 --- a/rush/c160006035.lua +++ b/rush/c160006035.lua @@ -1,8 +1,10 @@ ---Gatekeeping Gargoyle +--門衛のガーゴイル +--Gate Gargoyle local s,id=GetID() function s.initial_effect(c) --Make 1 of your monsters gain 1 level local e1=Effect.CreateEffect(c) + e1:SetDescription(aux.Stringid(id,0)) e1:SetType(EFFECT_TYPE_IGNITION) e1:SetRange(LOCATION_MZONE) e1:SetCountLimit(1) diff --git a/rush/c160006037.lua b/rush/c160006037.lua index 8f9b720960..fe9d1e653b 100644 --- a/rush/c160006037.lua +++ b/rush/c160006037.lua @@ -1,4 +1,4 @@ --- ブレイドザウルス +-- ブレイドザウルス -- Bladesaurus local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160006040.lua b/rush/c160006040.lua index bab4e64db0..cf1e1e6e59 100644 --- a/rush/c160006040.lua +++ b/rush/c160006040.lua @@ -1,4 +1,4 @@ --- ハイパーノヴァ +-- ハイパーノヴァ -- Hypernova local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160006043.lua b/rush/c160006043.lua index 419894462d..b0f8fb0131 100644 --- a/rush/c160006043.lua +++ b/rush/c160006043.lua @@ -1,4 +1,4 @@ --- アゲインスト・バスター +-- アゲインスト・バスター --Against Buster local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160006044.lua b/rush/c160006044.lua index d774982e61..35ad7f715b 100644 --- a/rush/c160006044.lua +++ b/rush/c160006044.lua @@ -1,4 +1,4 @@ ---ストーム・ソニック +--ストーム・ソニック --Storm Sonic local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160006045.lua b/rush/c160006045.lua index 9d0e6eca38..1e20b95b84 100644 --- a/rush/c160006045.lua +++ b/rush/c160006045.lua @@ -1,5 +1,5 @@ ---フォローウィング・ワールド ---Follow Wing World +--フォローウィング・ワールド +--Following World local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160006046.lua b/rush/c160006046.lua index 8b6efe34b9..2bf86a6580 100644 --- a/rush/c160006046.lua +++ b/rush/c160006046.lua @@ -1,5 +1,5 @@ -- 名刺しの命死交換 --- Deadly Business Card Exchange +--Business Card Barrage local s,id=GetID() function s.initial_effect(c) @@ -25,7 +25,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return #dg>0 end end function s.desfilter(c) - return c:IsFaceup() and c:IsLevelBelow(7) + return c:IsFaceup() and c:IsLevelBelow(7) end function s.activate(e,tp,eg,ep,ev,re,r,rp) --Effect diff --git a/rush/c160006047.lua b/rush/c160006047.lua index 6ba8ce29a9..91204a5033 100644 --- a/rush/c160006047.lua +++ b/rush/c160006047.lua @@ -1,9 +1,10 @@ --- 体力増強剤ストロングZ Tairyoku Zoukyou Zai Strong Z (Strength Enhancement Drug Strong Z/Strong Z/Energy Drink Z) - +--体力増強剤ストロングＺ +--Nutrient Zero local s,id=GetID() function s.initial_effect(c) --Gain LP equal to sum of the targeted monsters' Level local e1=Effect.CreateEffect(c) + e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_RECOVER) e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetCode(EVENT_FREE_CHAIN) diff --git a/rush/c160006048.lua b/rush/c160006048.lua index d4966d48e4..455ac86800 100644 --- a/rush/c160006048.lua +++ b/rush/c160006048.lua @@ -1,5 +1,5 @@ -- ジャスト・ミート --- Just Meat +--Best Bite -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160006050.lua b/rush/c160006050.lua index 54f06f507d..71298fd7da 100644 --- a/rush/c160006050.lua +++ b/rush/c160006050.lua @@ -1,4 +1,4 @@ ---ワイルド・キッチン +--ワイルド・キッチン --Wild Kitchen local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160006052.lua b/rush/c160006052.lua index 91c55fa768..ac4973865e 100644 --- a/rush/c160006052.lua +++ b/rush/c160006052.lua @@ -1,5 +1,5 @@ -- 渡来古討つデカコレーション --- Dried Fruit De-kako-ration +--Dekorelic Dessert -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160006053.lua b/rush/c160006053.lua index 8a4ac0bd74..0aa77c5565 100644 --- a/rush/c160006053.lua +++ b/rush/c160006053.lua @@ -1,4 +1,4 @@ ---陰陽封陣 +--陰陽封陣 --Talismanic Seal Array local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160006054.lua b/rush/c160006054.lua index d8a2aa9a7e..8d37c5b3c5 100644 --- a/rush/c160006054.lua +++ b/rush/c160006054.lua @@ -1,5 +1,5 @@ ---鉄の重撃 ---Iron Onslaught +--鉄の重撃 +--Barrage of Steel local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160006055.lua b/rush/c160006055.lua index ba597c1059..959a1fd6cb 100644 --- a/rush/c160006055.lua +++ b/rush/c160006055.lua @@ -1,5 +1,5 @@ --野獣の激怒 ---Rage of the Wild Beasts +--Rage of the Beasts local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160006056.lua b/rush/c160006056.lua index 2d9e093faf..257cf04947 100644 --- a/rush/c160006056.lua +++ b/rush/c160006056.lua @@ -1,4 +1,5 @@ --- Berserker Colosseum +--バーサーカーコロシアム +--Berserker Colosseum local s,id=GetID() function s.initial_effect(c) --activate diff --git a/rush/c160006057.lua b/rush/c160006057.lua index 5f58af462c..33da367359 100644 --- a/rush/c160006057.lua +++ b/rush/c160006057.lua @@ -1,5 +1,5 @@ -- ミスマッチ・ライバリー --- Mismatch Rivalry +--Mismatched Rivalry -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160006060.lua b/rush/c160006060.lua index e6eab164e5..248f6ed9b0 100644 --- a/rush/c160006060.lua +++ b/rush/c160006060.lua @@ -1,4 +1,4 @@ ---魔将決闘斬 +--魔将決闘斬 --Dark Ruler Battle Slash local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160006061.lua b/rush/c160006061.lua index 3ba829fe01..5f0c3c68a0 100644 --- a/rush/c160006061.lua +++ b/rush/c160006061.lua @@ -1,4 +1,4 @@ ---援護弾幕 +--援護弾幕 -- Covering Barrage local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160006062.lua b/rush/c160006062.lua index 402e09de5c..22d2244f63 100644 --- a/rush/c160006062.lua +++ b/rush/c160006062.lua @@ -20,7 +20,7 @@ end function s.condition(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetAttackTarget() local ac=Duel.GetAttacker() - return tc and tc:IsFaceup() and tc:IsControler(tp) and ac:IsControler(1-tp) and ac:IsLevelBelow(8) + return tc and tc:IsFaceup() and tc:IsControler(tp) and ac:IsControler(1-tp) and ac:IsLevelBelow(8) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local tg=Duel.GetAttackTarget() diff --git a/rush/c160006063.lua b/rush/c160006063.lua index 873471d19f..eb72013910 100644 --- a/rush/c160006063.lua +++ b/rush/c160006063.lua @@ -19,7 +19,7 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.CheckLPCost(tp,600) end end function s.condition(e,tp,eg,ep,ev,re,r,rp) - local tc=Duel.GetAttackTarget() + local tc=Duel.GetAttackTarget() return tc and tc:IsFaceup() and tc:IsControler(tp) and tc:IsRace(RACE_MACHINE) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/rush/c160006064.lua b/rush/c160006064.lua index 4de905f2f0..828b306e46 100644 --- a/rush/c160006064.lua +++ b/rush/c160006064.lua @@ -1,5 +1,5 @@ --永久凍結 ---Eternal Freeze +--Forever Freeze local s,id=GetID() function s.initial_effect(c) --Activate(summon) diff --git a/rush/c160007000.lua b/rush/c160007000.lua index f494e6600e..eb1459fc66 100644 --- a/rush/c160007000.lua +++ b/rush/c160007000.lua @@ -1,5 +1,5 @@ --海竜－ダイダロス ---Levia-Dragon - Daedalus +--Levia-Dragon - Daedalus (Rush) local s,id=GetID() function s.initial_effect(c) --Destroy all cards on the field diff --git a/rush/c160007011.lua b/rush/c160007011.lua index 387256e2be..126ad1947f 100644 --- a/rush/c160007011.lua +++ b/rush/c160007011.lua @@ -1,5 +1,5 @@ -- ネクロマン三世 --- Necroman III +--Necroman the Third -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160007013.lua b/rush/c160007013.lua index e6eff584a7..418c6aec1f 100644 --- a/rush/c160007013.lua +++ b/rush/c160007013.lua @@ -1,5 +1,5 @@ -- 山嵐竜 --- Mountain Storm Dragon +--Porcupine Dragon -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) @@ -31,7 +31,7 @@ function s.tgop(e,tp,eg,ep,ev,re,r,rp) Duel.PayLPCost(tp,500) -- Effect Duel.DiscardDeck(tp,1,REASON_EFFECT) - if #Duel.GetOperatedGroup()>0 + if #Duel.GetOperatedGroup()>0 and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_GRAVE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) diff --git a/rush/c160007014.lua b/rush/c160007014.lua index 229f440428..0bef75de49 100644 --- a/rush/c160007014.lua +++ b/rush/c160007014.lua @@ -1,8 +1,8 @@ -- サイピックアッパー --- Psyphickupper +--Psypickupper local s,id=GetID() function s.initial_effect(c) - -- Set + -- Set local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_RECOVER) @@ -33,7 +33,7 @@ local c=e:GetHandler() e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(-800) c:RegisterEffect(e1) if Duel.SelectYesNo(tp,aux.Stringid(id,0)) then diff --git a/rush/c160007015.lua b/rush/c160007015.lua index 57dfd94f44..199024b724 100644 --- a/rush/c160007015.lua +++ b/rush/c160007015.lua @@ -1,8 +1,10 @@ ---鬼将メザメ Kishou Mezame (Mezame the Oni Commander) +--鬼将メザメ +--Mezame the Ringing Alarm local s,id=GetID() function s.initial_effect(c) --Add card to hand local e1=Effect.CreateEffect(c) + e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_TOHAND) e1:SetType(EFFECT_TYPE_IGNITION) e1:SetRange(LOCATION_MZONE) @@ -36,7 +38,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_OATH) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end end diff --git a/rush/c160007016.lua b/rush/c160007016.lua index 84797a721c..24d2c43d33 100644 --- a/rush/c160007016.lua +++ b/rush/c160007016.lua @@ -1,5 +1,5 @@ --貫貴益荒男 ---Pierce Samurai +--Piercing Samurai local s,id=GetID() function s.initial_effect(c) --Give Piercing damage to a Warrior monster diff --git a/rush/c160007017.lua b/rush/c160007017.lua index 7798e5612c..f1ed4752ee 100644 --- a/rush/c160007017.lua +++ b/rush/c160007017.lua @@ -1,5 +1,5 @@ -- 月魔将キメルーナ ---Kimeluna the Lunar Dark Decider +--Kimeluna the Dark Shifter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160007019.lua b/rush/c160007019.lua index 117cdc5b1e..c2770855eb 100644 --- a/rush/c160007019.lua +++ b/rush/c160007019.lua @@ -1,5 +1,5 @@ -- ヴィスカム・ナノトロン --- Viskam Nanotron +--Viscom Nanotron -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160007020.lua b/rush/c160007020.lua index 1e84b60371..887f8e7a46 100644 --- a/rush/c160007020.lua +++ b/rush/c160007020.lua @@ -1,5 +1,5 @@ -- 幻刃天竜ガントリー・ドラゴン --- Gantry Dragon the Mythic Sword Heavenly Dragon +--Constructor Sky Wyrm Gantry Dragon local s,id=GetID() function s.initial_effect(c) --Special summon wyrm normal monster from GY @@ -39,7 +39,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_OATH) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end end diff --git a/rush/c160007023.lua b/rush/c160007023.lua index d4f4c24dc4..e8c92fbac1 100644 --- a/rush/c160007023.lua +++ b/rush/c160007023.lua @@ -1,4 +1,4 @@ ---カタオモイルカ +--カタオモイルカ --Kataomoiruka local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160007024.lua b/rush/c160007024.lua index 75a2bebfa4..bd6f8a3428 100644 --- a/rush/c160007024.lua +++ b/rush/c160007024.lua @@ -1,5 +1,5 @@ -- ヘッドバッドキャシャロット --- Headbutt Cachalot +--Head Bad Cachalot local s,id=GetID() function s.initial_effect(c) -- atk + damage diff --git a/rush/c160007025.lua b/rush/c160007025.lua index 84ac8b1612..b9ba1ef594 100644 --- a/rush/c160007025.lua +++ b/rush/c160007025.lua @@ -1,4 +1,4 @@ ---ドドドセカンド +--ドドドセカンド --Dododo Second local s,id=GetID() function s.initial_effect(c) @@ -18,7 +18,7 @@ function s.fupfilter(c) end function s.condition(e,tp,eg,ep,ev,re,r,rp) return Duel.IsExistingMatchingCard(s.fupfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) - and (not Duel.IsPlayerAffectedByEffect(tp,FLAG_NO_TRIBUTE)) + and (not Duel.IsPlayerAffectedByEffect(tp,FLAG_NO_TRIBUTE)) and e:GetHandler():CanBeDoubleTribute(FLAG_DOUBLE_TRIB_FIRE) end function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/rush/c160007026.lua b/rush/c160007026.lua index 25418c38d6..f25163af9f 100644 --- a/rush/c160007026.lua +++ b/rush/c160007026.lua @@ -51,7 +51,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_OATH) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end end diff --git a/rush/c160007027.lua b/rush/c160007027.lua index 1325583077..684d873799 100644 --- a/rush/c160007027.lua +++ b/rush/c160007027.lua @@ -1,5 +1,5 @@ --- 背番号99 球児皇龍ホームグランドラ --- Uniform No. 99: Junior Baseball King Dragon, Home Groundra +-- 背番号99 球児皇龍ホームグランドラ +--Player #99: Grand Slam Dragon local s,id=GetID() function s.initial_effect(c) --Activate @@ -12,7 +12,7 @@ function s.initial_effect(c) e1:SetTarget(s.target) e1:SetOperation(s.operation) c:RegisterEffect(e1) -end +end s.listed_names={CARD_UNIFORM_39} function s.tdfilter(c,tp) return c:IsMonster() and c:IsAttribute(ATTRIBUTE_FIRE) and c:IsAbleToDeckOrExtraAsCost() @@ -49,7 +49,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(2000) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) c:RegisterEffect(e1) end end diff --git a/rush/c160007028.lua b/rush/c160007028.lua index e65dcfa317..2874e3834d 100644 --- a/rush/c160007028.lua +++ b/rush/c160007028.lua @@ -1,5 +1,5 @@ --背番号３９ 球児皇ホーム ---Uniform No. 39: Junior Baseball King, Home +--Player #39: Home Run Hitter local s,id=GetID() function s.initial_effect(c) @@ -37,7 +37,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(2500) c:RegisterEffect(e1) --Other monsters cannot attack @@ -47,7 +47,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e2:SetTargetRange(LOCATION_MZONE,0) e2:SetTarget(s.ftarget) e2:SetLabel(c:GetFieldID()) - e2:SetReset(RESET_PHASE+PHASE_END) + e2:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e2,tp) end end diff --git a/rush/c160007029.lua b/rush/c160007029.lua index 3f6ce1339a..30b32cd0f6 100644 --- a/rush/c160007029.lua +++ b/rush/c160007029.lua @@ -1,5 +1,5 @@ -- 報道狸マイクタン --- Reporter Raccoon Miketan +--Reporter Raccoon -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160007030.lua b/rush/c160007030.lua index 8fc7e76a1d..5b47022a2e 100644 --- a/rush/c160007030.lua +++ b/rush/c160007030.lua @@ -1,5 +1,5 @@ -- お掃除マシン・ゴーガイン --- Cleaning Machine Gorgain +--Clean Machine Newsweeper local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160007031.lua b/rush/c160007031.lua index 36a90310d0..bcab4e91d0 100644 --- a/rush/c160007031.lua +++ b/rush/c160007031.lua @@ -1,5 +1,5 @@ --海竜クレインドロス ---Sea Dragon Cranedross +--Sea Dragon Kleindros local s,id=GetID() function s.initial_effect(c) --Special summon 1 Sea Serpent/Fish monster from hand @@ -53,7 +53,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e2:SetProperty(EFFECT_FLAG_OATH) e2:SetTargetRange(LOCATION_MZONE,0) e2:SetTarget(s.ftarget) - e2:SetReset(RESET_PHASE+PHASE_END) + e2:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e2,tp) end end diff --git a/rush/c160007032.lua b/rush/c160007032.lua index a27dc4184e..acb7b9917f 100644 --- a/rush/c160007032.lua +++ b/rush/c160007032.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) c:RegisterEffect(e1) end function s.revcostfilter(c) - return c:IsMonster() and c:IsAbleToDeckOrExtraAsCost() + return c:IsMonster() and c:IsAbleToDeckOrExtraAsCost() end function s.revcost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(s.revcostfilter,tp,LOCATION_GRAVE,0,2,nil) end diff --git a/rush/c160007034.lua b/rush/c160007034.lua index b94fd5ce69..3a3e97aaf9 100644 --- a/rush/c160007034.lua +++ b/rush/c160007034.lua @@ -1,5 +1,5 @@ -- 混沌の勇者ライダクロス・アッシュ --- Brave of Chaos, Lydacross Ash +--Raidacross Ash, Hero of Chaos local s,id=GetID() function s.initial_effect(c) --fusion material @@ -45,7 +45,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(atkval) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) c:RegisterEffect(e1) end end diff --git a/rush/c160007036.lua b/rush/c160007036.lua index f9d143f7a0..325277746b 100644 --- a/rush/c160007036.lua +++ b/rush/c160007036.lua @@ -1,5 +1,5 @@ --てんしょうルーラヤメテラス ---Yamiterasu the Divine Delayer +--Yamiterasu the Divine Ruler local s,id=GetID() function s.initial_effect(c) --fusion material diff --git a/rush/c160007038.lua b/rush/c160007038.lua index 7c50242480..7cff403326 100644 --- a/rush/c160007038.lua +++ b/rush/c160007038.lua @@ -1,5 +1,5 @@ -- 火麺特忍ニクマシゴックブート --- Masked Fiery Noodle Tokunin Nikumashi Gockboot +--Meat Spice the Special Noodle Ninja -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160007039.lua b/rush/c160007039.lua index b84e467e0d..f9e5293d43 100644 --- a/rush/c160007039.lua +++ b/rush/c160007039.lua @@ -1,4 +1,5 @@ --- 火麺特忍ミソインスタント (かめんとくにんミソインスタント) Kamen Tokunin Miso Instant (Fiery Masked Noodle Tokunin Miso Instant) +--火麺特忍ミソインスタント +--Miso Instant the Special Noodle Ninja local s,id=GetID() function s.initial_effect(c) --fusion material diff --git a/rush/c160007041.lua b/rush/c160007041.lua index 5f66aef76d..8418a8185a 100644 --- a/rush/c160007041.lua +++ b/rush/c160007041.lua @@ -1,4 +1,5 @@ --フェンリルリッター・ソル Fenrirewritter Sol +--Fenrirewritter Sol local s,id=GetID() function s.initial_effect(c) --fusion material diff --git a/rush/c160007042.lua b/rush/c160007042.lua index a7a3c230ab..a771828207 100644 --- a/rush/c160007042.lua +++ b/rush/c160007042.lua @@ -1,5 +1,5 @@ ---超魔基地マグナム・オーバーベース --- Super Magibase Magnum Overbase +--超魔基地マグナム・オーバーベース +--Supreme Marine Fortress Magnum Overbase local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160007044.lua b/rush/c160007044.lua index de6d71b536..062d5c69a1 100644 --- a/rush/c160007044.lua +++ b/rush/c160007044.lua @@ -48,8 +48,8 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp,chk) -- Effect Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) local hg=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_GRAVE,0,1,1,nil) - if #hg>0 and Duel.SendtoHand(hg,nil,REASON_EFFECT)>0 - and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,1,nil) + if #hg>0 and Duel.SendtoHand(hg,nil,REASON_EFFECT)>0 + and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,3)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATKDEF) local ag=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,1,1,nil) diff --git a/rush/c160007045.lua b/rush/c160007045.lua index 9ed26ff995..fe7834ffd3 100644 --- a/rush/c160007045.lua +++ b/rush/c160007045.lua @@ -43,7 +43,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(-800) tc:RegisterEffect(e1) end diff --git a/rush/c160007046.lua b/rush/c160007046.lua index 584e39ff96..ed9c4fa897 100644 --- a/rush/c160007046.lua +++ b/rush/c160007046.lua @@ -1,5 +1,5 @@ --消失の奔流 ---Vanishing Torrent +--Stream of Elimination local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160007047.lua b/rush/c160007047.lua index ec57c3e9dc..5d8b86b23d 100644 --- a/rush/c160007047.lua +++ b/rush/c160007047.lua @@ -1,5 +1,5 @@ --Hot-Blooded Spirits Stadium --- 熱血スピリッツ・スタジアム +--Feverous Spirit Stadium local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160007049.lua b/rush/c160007049.lua index e47c80f1c2..087ee1da7e 100644 --- a/rush/c160007049.lua +++ b/rush/c160007049.lua @@ -1,5 +1,5 @@ -- シンブンシン --- Duplicate Newspaper +--Reprinter local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160007050.lua b/rush/c160007050.lua index e140be266f..5f217f652e 100644 --- a/rush/c160007050.lua +++ b/rush/c160007050.lua @@ -1,5 +1,5 @@ -- 火麺炙りバーナーの術 --- Art of Masked Fiery Noodle Scorching Burner +--The Noodle Art of Roastery local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160007051.lua b/rush/c160007051.lua index b77ca6187f..8a4c154eac 100644 --- a/rush/c160007051.lua +++ b/rush/c160007051.lua @@ -1,5 +1,5 @@ -- 火麺ドローっと濃厚返しの術 --- Art of Masked Fiery Noodle Drawing-Out-The-Rich-Tasty-Flavor Reversal +--The Noodle Art of Saucery -- Scripted bu Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160007052.lua b/rush/c160007052.lua index 0a04b49c6d..8df3eed217 100644 --- a/rush/c160007052.lua +++ b/rush/c160007052.lua @@ -27,8 +27,8 @@ function s.drop(e,tp,eg,ep,ev,re,r,rp) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) local tc=Duel.SelectMatchingCard(tp,s.drcostfilter,tp,LOCATION_HAND,0,1,1,nil):GetFirst() if Duel.SendtoGrave(tc,REASON_COST)==1 and Duel.Draw(tp,1,REASON_EFFECT)>0 - and tc:IsLocation(LOCATION_GRAVE) and tc:IsLevel(7) - and Duel.IsPlayerCanDraw(tp,1) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then + and tc:IsLocation(LOCATION_GRAVE) and tc:IsLevel(7) + and Duel.IsPlayerCanDraw(tp,1) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then Duel.BreakEffect() Duel.Draw(tp,1,REASON_EFFECT) end diff --git a/rush/c160007053.lua b/rush/c160007053.lua index 9fdd31653c..8beea5ea9c 100644 --- a/rush/c160007053.lua +++ b/rush/c160007053.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) c:RegisterEffect(e1) end function s.cfilter(c) - return c:IsMonster() and c:IsAbleToDeckOrExtraAsCost() + return c:IsMonster() and c:IsAbleToDeckOrExtraAsCost() end function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_GRAVE,0,2,nil) end @@ -29,7 +29,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,2,tp,LOCATION_GRAVE) end function s.tdfilter3(c) - return c:IsMonster() and c:IsAbleToDeck() + return c:IsMonster() and c:IsAbleToDeck() end function s.activate(e,tp,eg,ep,ev,re,r,rp) -- Requirement diff --git a/rush/c160007054.lua b/rush/c160007054.lua index 9b778dbcd5..341ae28ce6 100644 --- a/rush/c160007054.lua +++ b/rush/c160007054.lua @@ -1,5 +1,5 @@ --小川 ---Creek +--Stream local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160007055.lua b/rush/c160007055.lua index 6b333c82dd..27743534ea 100644 --- a/rush/c160007055.lua +++ b/rush/c160007055.lua @@ -19,8 +19,8 @@ end function s.tgop(e,tp,eg,ep,ev,re,r,rp) local g=Duel.GetFieldGroup(tp,LOCATION_HAND,LOCATION_HAND) if Duel.SendtoGrave(g,REASON_EFFECT+REASON_DISCARD)<1 - or #g:Match(Card.IsLocation,nil,LOCATION_GRAVE)<1 - or not Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,LOCATION_MZONE,0,1,nil) + or #g:Match(Card.IsLocation,nil,LOCATION_GRAVE)<1 + or not Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,LOCATION_MZONE,0,1,nil) or not Duel.SelectYesNo(tp,aux.Stringid(id,0)) then return end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATKDEF) local tc=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,LOCATION_MZONE,0,1,1,nil):GetFirst() diff --git a/rush/c160007056.lua b/rush/c160007056.lua index bc089b842a..a0653a8907 100644 --- a/rush/c160007056.lua +++ b/rush/c160007056.lua @@ -1,5 +1,5 @@ -- カンバック！カンショック！！ --- Comeback! Feelshock!! +--Shocking Comeback!! -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) @@ -30,7 +30,7 @@ function s.lpop(e,tp,eg,ep,ev,re,r,rp) if not tc then return end Duel.HintSelection(tc,true) local rec=Duel.Recover(tp,tc:GetAttack(),REASON_EFFECT) - if rec>=1000 and tc:IsAbleToHand() and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then + if rec>=1000 and tc:IsAbleToHand() and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then Duel.BreakEffect() Duel.SendtoHand(tc,nil,REASON_EFFECT) end diff --git a/rush/c160007057.lua b/rush/c160007057.lua index 8495c68632..c8a553c6e1 100644 --- a/rush/c160007057.lua +++ b/rush/c160007057.lua @@ -16,7 +16,7 @@ end function s.condition(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetAttackTarget() local ac=Duel.GetAttacker() - return tc and tc:IsFaceup() and tc:IsControler(tp) and ac:IsControler(1-tp) and tc:IsLevelAbove(10) + return tc and tc:IsFaceup() and tc:IsControler(tp) and ac:IsControler(1-tp) and tc:IsLevelAbove(10) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local tg=Duel.GetAttackTarget() diff --git a/rush/c160007058.lua b/rush/c160007058.lua index 82ccd8e85f..902f2357f3 100644 --- a/rush/c160007058.lua +++ b/rush/c160007058.lua @@ -1,5 +1,5 @@ --海豚反撃 ---Dolphin Counter +--Dolphin Counterattack local s,id=GetID() function s.initial_effect(c) --Destroy a monster with the highest ATK, draw 1 card and inflict 500 damage to the opponent diff --git a/rush/c160007061.lua b/rush/c160007061.lua index c952e3ee76..2b246edb0f 100644 --- a/rush/c160007061.lua +++ b/rush/c160007061.lua @@ -1,5 +1,5 @@ --リクエスト９ ---Request 9 +--Requesting 9 local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160007062.lua b/rush/c160007062.lua index e6b17bec27..27458b98d6 100644 --- a/rush/c160007062.lua +++ b/rush/c160007062.lua @@ -1,5 +1,5 @@ -- 現場からは以上です！ --- That's All from the Scene! +--Reporting from the Scene! -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) @@ -35,6 +35,6 @@ function s.damop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e1:SetTargetRange(1,0) e1:SetValue(1) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end \ No newline at end of file diff --git a/rush/c160007063.lua b/rush/c160007063.lua index 265dec7734..1e774e98c4 100644 --- a/rush/c160007063.lua +++ b/rush/c160007063.lua @@ -1,5 +1,5 @@ -- 事件です！ --- It's an Accident! +--Breaking News! -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160007064.lua b/rush/c160007064.lua index 077ef5c1d7..11e181f7d5 100644 --- a/rush/c160007064.lua +++ b/rush/c160007064.lua @@ -42,7 +42,7 @@ function s.damop(e,tp,eg,ep,ev,re,r,rp) e1:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE) e1:SetTarget(function(_,tc)return tc:IsFacedown()end) e1:SetValue(1) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,1-tp) aux.RegisterClientHint(c,0,tp,0,1,aux.Stringid(id,0),RESET_PHASE+PHASE_END) end \ No newline at end of file diff --git a/rush/c160008014.lua b/rush/c160008014.lua index e116e9c220..d23909d85f 100644 --- a/rush/c160008014.lua +++ b/rush/c160008014.lua @@ -1,5 +1,5 @@ --戦天女キリハリー ---Valkyrian Cutpasterie +--Shearkyrie the Celestial Seamstress local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160008016.lua b/rush/c160008016.lua index f08f79a5d9..bd0a36142a 100644 --- a/rush/c160008016.lua +++ b/rush/c160008016.lua @@ -31,7 +31,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(1500) c:RegisterEffect(e1) local dg=Duel.GetMatchingGroup(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,1,1,nil) diff --git a/rush/c160008017.lua b/rush/c160008017.lua index 04b8a6920f..a207c45aee 100644 --- a/rush/c160008017.lua +++ b/rush/c160008017.lua @@ -1,5 +1,5 @@ --カマレオン ---Mantisleon +--Kamaleon local s,id=GetID() function s.initial_effect(c) @@ -49,7 +49,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CANNOT_ATTACK) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end function s.ftarget(e,c) diff --git a/rush/c160008018.lua b/rush/c160008018.lua index 0d65b97876..e64931118f 100644 --- a/rush/c160008018.lua +++ b/rush/c160008018.lua @@ -1,5 +1,5 @@ -- ツメレオン --- Clawleon +--Clawmeleon local s,id=GetID() function s.initial_effect(c) --Give Piercing damage to a Reptile monster diff --git a/rush/c160008019.lua b/rush/c160008019.lua index 826cdd6fe5..9fc44bb3fb 100644 --- a/rush/c160008019.lua +++ b/rush/c160008019.lua @@ -1,5 +1,5 @@ -- ホット・カエンレオン ---Hot Flameleon +--Fiery Infernleon local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160008020.lua b/rush/c160008020.lua index 7908f2c727..3f074492be 100644 --- a/rush/c160008020.lua +++ b/rush/c160008020.lua @@ -42,7 +42,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(600) c:RegisterEffect(e1) end diff --git a/rush/c160008021.lua b/rush/c160008021.lua index db0f35bfa8..154c67ea64 100644 --- a/rush/c160008021.lua +++ b/rush/c160008021.lua @@ -1,5 +1,5 @@ --プレデター・ガンレオン ---Predator Gunleon +--Predator Ganleon --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) @@ -35,7 +35,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(atk) c:RegisterEffect(e1) end diff --git a/rush/c160008022.lua b/rush/c160008022.lua index 597a068f67..0dd118f00b 100644 --- a/rush/c160008022.lua +++ b/rush/c160008022.lua @@ -1,5 +1,5 @@ -- エクディシス・カリギュレオン --- Ecdisys Caliguleon +--Ecdysis Caesarleon -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160008023.lua b/rush/c160008023.lua index 298505b5ea..9d7747c69d 100644 --- a/rush/c160008023.lua +++ b/rush/c160008023.lua @@ -1,5 +1,5 @@ --観測亀スパイタートル ---Spyturtle the Observational Turtle +--Spyturtle local s,id=GetID() function s.initial_effect(c) --Make 1 of your winged beast monsters gain 200 ATK and 2 level diff --git a/rush/c160008025.lua b/rush/c160008025.lua index 6df09f8712..54e2bb1115 100644 --- a/rush/c160008025.lua +++ b/rush/c160008025.lua @@ -1,9 +1,10 @@ ---Zap Zap Octospark --バチバチ・オクトスパーク +--Zap Zap Octospark local s,id=GetID() function s.initial_effect(c) --Draw 1 card local e1=Effect.CreateEffect(c) + e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DAMAGE) e1:SetType(EFFECT_TYPE_IGNITION) e1:SetRange(LOCATION_MZONE) @@ -29,7 +30,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(400) c:RegisterEffect(e1) Duel.Damage(1-tp,400,REASON_EFFECT) diff --git a/rush/c160008026.lua b/rush/c160008026.lua index ba3e8df671..0a8bc758a4 100644 --- a/rush/c160008026.lua +++ b/rush/c160008026.lua @@ -1,5 +1,5 @@ -- 恵雷の精霊 --- Spirit of Bolt of Inspiration +--Lightning Bringer Spirit local s,id=GetID() function s.initial_effect(c) --Shuffle 1 card from your opponent's GY into the Deck diff --git a/rush/c160008027.lua b/rush/c160008027.lua index e5b4bea4f6..899faaa867 100644 --- a/rush/c160008027.lua +++ b/rush/c160008027.lua @@ -1,9 +1,10 @@ ---Sensor Duckbuill --- センサー・ダックビル +--センサー・ダックビル +--Sensor Duckbill local s,id=GetID() function s.initial_effect(c) --Add card to hand local e1=Effect.CreateEffect(c) + e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_TOHAND) e1:SetType(EFFECT_TYPE_IGNITION) e1:SetRange(LOCATION_MZONE) @@ -24,7 +25,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_GRAVE) end function s.operation(e,tp,eg,ep,ev,re,r,rp) - --Requirement + --Requirement local td=Duel.SelectMatchingCard(tp,Card.IsAbleToDeckOrExtraAsCost,tp,LOCATION_HAND,0,1,1,nil) if Duel.SendtoDeck(td,nil,SEQ_DECKBOTTOM,REASON_COST)~0 then --effect @@ -35,4 +36,4 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) Duel.ConfirmCards(1-tp,g) end end -end +end \ No newline at end of file diff --git a/rush/c160008031.lua b/rush/c160008031.lua index ad2922874c..f34465dd0c 100644 --- a/rush/c160008031.lua +++ b/rush/c160008031.lua @@ -27,7 +27,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(300) c:RegisterEffect(e1) -- Piercing Damage diff --git a/rush/c160008032.lua b/rush/c160008032.lua index 9a7d308706..9fc286e116 100644 --- a/rush/c160008032.lua +++ b/rush/c160008032.lua @@ -1,5 +1,5 @@ --マスター・オブ・セブンスロード ---Master of Sevens Road +--Master of the Sevens Road local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() diff --git a/rush/c160008033.lua b/rush/c160008033.lua index 6508d370d4..76969adfef 100644 --- a/rush/c160008033.lua +++ b/rush/c160008033.lua @@ -1,5 +1,5 @@ --朧撃龍ミラギアスターＦ ---Fantasia Strike Dragon Miragiastar F +--Hazy Strike Dragon Miragiastar F local s,id=GetID() function s.initial_effect(c) --fusion material diff --git a/rush/c160008034.lua b/rush/c160008034.lua index e43442970e..d83109611c 100644 --- a/rush/c160008034.lua +++ b/rush/c160008034.lua @@ -30,7 +30,7 @@ function s.initial_effect(c) end --cost function s.tdfilter(c,tp) - return c:IsCode(160201028) and c:IsAbleToDeckOrExtraAsCost() and Duel.IsExistingMatchingCard(s.tdfilter2,tp,LOCATION_GRAVE,0,1,c) + return c:IsCode(160201028) and c:IsAbleToDeckOrExtraAsCost() and Duel.IsExistingMatchingCard(s.tdfilter2,tp,LOCATION_GRAVE,0,1,c) end function s.tdfilter2(c) return c:IsCode(160002023) and c:IsAbleToDeckOrExtraAsCost() diff --git a/rush/c160008036.lua b/rush/c160008036.lua index f657c5123d..e31bebe1ca 100644 --- a/rush/c160008036.lua +++ b/rush/c160008036.lua @@ -1,5 +1,5 @@ -- 天翔流麗セメテラス ---Semeterasu the Celestial Summoner +--Semeterasu the Divine Ruler local s,id=GetID() function s.initial_effect(c) --fusion material diff --git a/rush/c160008037.lua b/rush/c160008037.lua index 511190fcd3..b7419167b8 100644 --- a/rush/c160008037.lua +++ b/rush/c160008037.lua @@ -1,5 +1,5 @@ --- Meika Etraynze the Shadow Flower Venus --- 花牙絢爛メイカ・エトランゼ +--花牙絢爛メイカ・エトランゼ +--Meika Etraynze the Shadow Flower Venus local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() @@ -22,13 +22,13 @@ function s.spfilter(c,e,tp) end function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 - and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_GRAVE+LOCATION_HAND,0,1,nil,e,tp) end - Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE+LOCATION_HAND) + and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_GRAVE|LOCATION_HAND,0,1,nil,e,tp) end + Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE|LOCATION_HAND) end function s.spop(e,tp,eg,ep,ev,re,r,rp) - if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_GRAVE+LOCATION_HAND,0,1,nil,e,tp) then + if Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_GRAVE|LOCATION_HAND,0,1,nil,e,tp) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) - local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_GRAVE+LOCATION_HAND,0,1,1,nil,e,tp) + local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_GRAVE|LOCATION_HAND,0,1,1,nil,e,tp) if #g>0 then Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP) end diff --git a/rush/c160008038.lua b/rush/c160008038.lua index fe37a908fb..0226bbd4b3 100644 --- a/rush/c160008038.lua +++ b/rush/c160008038.lua @@ -1,5 +1,5 @@ -- 花牙潜攻サブマリン・ドゥルガー --- Durga the Shadow Flower Stealth Submarine +--Durga the Shadow Flower Submarine local s,id=GetID() function s.initial_effect(c) --fusion material diff --git a/rush/c160008039.lua b/rush/c160008039.lua index 72acc4dc43..36f74d93d0 100644 --- a/rush/c160008039.lua +++ b/rush/c160008039.lua @@ -1,10 +1,10 @@ --メタリオン・キングコブラスター ---Metallion King Cobrastar +--Metarion King Cobrastar --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() - --"Imaginary Actor" + "Snake Clown" + --"Imaginary Actor" + "Snake Clown" Fusion.AddProcMix(c,true,true,CARD_IMAGINARY_ACTOR,160008002) --Draw local e1=Effect.CreateEffect(c) diff --git a/rush/c160008040.lua b/rush/c160008040.lua index 6621fbccd1..105f8b04b9 100644 --- a/rush/c160008040.lua +++ b/rush/c160008040.lua @@ -1,5 +1,5 @@ --- Poseigyon Advencharger --- ポセイギョン・アドベンチャラー +--ポセイギョン・アドベンチャラー +--Poseigyon Advencharger local s,id=GetID() function s.initial_effect(c) -- fusion @@ -7,6 +7,7 @@ function s.initial_effect(c) Fusion.AddProcMix(c,true,true,160008007,CARD_JELLYPLUG) --All pyro monsters you control gain ATK local e1=Effect.CreateEffect(c) + e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_ATKCHANGE) e1:SetType(EFFECT_TYPE_IGNITION) e1:SetRange(LOCATION_MZONE) @@ -31,7 +32,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) Duel.DiscardDeck(tp,1,REASON_COST) --Effect local g=Duel.GetMatchingGroup(aux.FaceupFilter(Card.IsRace,RACE_THUNDER),tp,LOCATION_MZONE,0,nil) - if not g then return end + if #g==0 then return end for tc in g:Iter() do local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) @@ -41,4 +42,4 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) end -end +end \ No newline at end of file diff --git a/rush/c160008041.lua b/rush/c160008041.lua index 6b29230a83..5c48655ef3 100644 --- a/rush/c160008041.lua +++ b/rush/c160008041.lua @@ -1,5 +1,5 @@ --- Showering Infergyo --- シャワーリング・インフェルギョ +--シャワーリング・インフェルギョ +--Showering Seaferno local s,id=GetID() function s.initial_effect(c) -- fusion @@ -7,6 +7,7 @@ function s.initial_effect(c) Fusion.AddProcMix(c,true,true,160008025,CARD_JELLYPLUG) --All pyro monsters you control gain ATK local e1=Effect.CreateEffect(c) + e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_ATKCHANGE+CATEGORY_DAMAGE) e1:SetType(EFFECT_TYPE_IGNITION) e1:SetRange(LOCATION_MZONE) @@ -56,4 +57,4 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) end end end -end +end \ No newline at end of file diff --git a/rush/c160008042.lua b/rush/c160008042.lua index 66da7de252..488a1c97c1 100644 --- a/rush/c160008042.lua +++ b/rush/c160008042.lua @@ -1,5 +1,5 @@ --- Prime Roast Beef Horseman --- ジョーミノケンタウロース +--ジョーミノケンタウロース +--Prime Roast Beef Horseman local s,id=GetID() function s.initial_effect(c) -- fusion summon @@ -36,7 +36,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) Duel.SortDecktop(tp,tp,#g) --gy recover local sg=Duel.GetMatchingGroup(s.thfilter,tp,LOCATION_GRAVE,0,nil) - if #sg>0 and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then + if #sg>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.BreakEffect() local tg=aux.SelectUnselectGroup(sg,1,tp,1,ft,s.rescon,1,tp) Duel.SendtoHand(tg,nil,REASON_EFFECT) diff --git a/rush/c160008043.lua b/rush/c160008043.lua index 49134f8853..777e4c3429 100644 --- a/rush/c160008043.lua +++ b/rush/c160008043.lua @@ -1,6 +1,5 @@ ---Hormone GunMcQueen, the Magnificent Shichirin --荒野の七輪ホルモン・ガンマックイーン - +--Hormone GunMcQueen, the Magnificent Shichirin local s,id=GetID() function s.initial_effect(c) --fusion material diff --git a/rush/c160008044.lua b/rush/c160008044.lua index aef73d56e9..91feab0eb0 100644 --- a/rush/c160008044.lua +++ b/rush/c160008044.lua @@ -40,7 +40,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(600) c:RegisterEffect(e1) if Duel.IsExistingMatchingCard(s.tdfilter,tp,LOCATION_GRAVE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,3)) diff --git a/rush/c160008045.lua b/rush/c160008045.lua index e0e6fad730..9f0424a274 100644 --- a/rush/c160008045.lua +++ b/rush/c160008045.lua @@ -1,5 +1,5 @@ --ヴァルカン・イグナイト・ハイパードライブ ---Vulcan Ignition Overdrive +--Vulcan Ignite Hyperdrive local s,id=GetID() function s.initial_effect(c) --Inflict damage diff --git a/rush/c160008046.lua b/rush/c160008046.lua index 8cc0a4d879..3006d655ac 100644 --- a/rush/c160008046.lua +++ b/rush/c160008046.lua @@ -20,8 +20,8 @@ function s.filter(c,e,tp) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 - and Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_GRAVE+LOCATION_HAND,0,1,nil,e,tp) end - Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE+LOCATION_HAND) + and Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_GRAVE|LOCATION_HAND,0,1,nil,e,tp) end + Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE|LOCATION_HAND) end function s.thfilter(c) return c:IsRace(RACE_FIEND) and c:IsAbleToHand() @@ -33,7 +33,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) --Effect if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) - local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_GRAVE+LOCATION_HAND,0,1,1,nil,e,tp) + local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_GRAVE|LOCATION_HAND,0,1,1,nil,e,tp) Duel.HintSelection(g) if #g>0 then local g2=Duel.GetMatchingGroup(s.thfilter,tp,LOCATION_GRAVE,0,g) diff --git a/rush/c160008047.lua b/rush/c160008047.lua index 2cc3b133ec..392566316a 100644 --- a/rush/c160008047.lua +++ b/rush/c160008047.lua @@ -1,5 +1,5 @@ -- 花牙紫吹 --- Shadow Flower Purple Smoke Spray +--Shadow Flower Flurry local s,id=GetID() function s.initial_effect(c) -- Activate diff --git a/rush/c160008050.lua b/rush/c160008050.lua index 799a33c315..a1a0428d57 100644 --- a/rush/c160008050.lua +++ b/rush/c160008050.lua @@ -1,5 +1,5 @@ --- Bobble Header --- ボブルヘッダー +--ボブルヘッダー +--Bobble Header local s,id=GetID() function s.initial_effect(c) --Activate @@ -13,18 +13,17 @@ function s.initial_effect(c) end s.listed_names={CARD_SPIRIT_STADIUM,160008049} function s.thfilter(c) - return c:IsCode(CARD_SPIRIT_STADIUM,160008049) and c:IsAbleToHand() + return c:IsCode(CARD_SPIRIT_STADIUM,160008049) and c:IsAbleToHand() end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_GRAVE,0,1,nil) end Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_GRAVE) end function s.activate(e,tp,eg,ep,ev,re,r,rp) - if not e:GetHandler():IsRelateToEffect(e) then return end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_GRAVE,0,1,2,nil) if #g>0 then Duel.SendtoHand(g,nil,REASON_EFFECT) Duel.ConfirmCards(1-tp,g) end -end +end \ No newline at end of file diff --git a/rush/c160008051.lua b/rush/c160008051.lua index 82913856b4..d84fb305a5 100644 --- a/rush/c160008051.lua +++ b/rush/c160008051.lua @@ -27,7 +27,7 @@ function s.cfilter(c) return c:IsLocation(LOCATION_GRAVE) and c:IsRace(RACE_REPTILE) and c:IsMonster() end function s.filter(c) - return c:IsRace(RACE_REPTILE) and c:IsFaceup() + return c:IsRace(RACE_REPTILE) and c:IsFaceup() end function s.activate(e,tp,eg,ep,ev,re,r,rp) --Requirement @@ -36,7 +36,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) Duel.DiscardDeck(tp,5,REASON_EFFECT) local g=Duel.GetOperatedGroup() local ct=g:FilterCount(s.cfilter,nil) - if ct>0 and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.filter),tp,LOCATION_MZONE,0,1,nil) + if ct>0 and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.filter),tp,LOCATION_MZONE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) local tc=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(s.filter),tp,LOCATION_MZONE,0,1,1,nil):GetFirst() diff --git a/rush/c160008052.lua b/rush/c160008052.lua index d03cefb832..382f1df46a 100644 --- a/rush/c160008052.lua +++ b/rush/c160008052.lua @@ -1,10 +1,10 @@ --- デッキ改かい造ぞうパック 創そう造ぞうのマスターロード！！ --- Explosive Rage - +--逆鱗火斬 +--Fire Wrath local s,id=GetID() function s.initial_effect(c) - --Destroy 1 of opponent's level 8 or lower monsters + --Destroy 1 face-up monster on your opponent's field with an equal or lower Level than the total Level of the monsters sent to the Graveyard local e1=Effect.CreateEffect(c) + e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_DESTROY) e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetCode(EVENT_FREE_CHAIN) @@ -14,11 +14,11 @@ function s.initial_effect(c) end function s.costfilter(c,tp) return c:IsMonster() and c:IsRace(RACE_REPTILE) and c:IsAbleToGraveAsCost() - and Duel.IsExistingMatchingCard(s.costfilter2,tp,LOCATION_HAND,0,1,c,tp,c:GetLevel()) + and Duel.IsExistingMatchingCard(s.costfilter2,tp,LOCATION_HAND,0,1,c,tp,c:GetLevel()) end function s.costfilter2(c,tp,lv) return c:IsMonster() and c:IsRace(RACE_REPTILE) and c:IsAbleToGraveAsCost() - and Duel.IsExistingMatchingCard(s.desfilter,tp,0,LOCATION_MZONE,1,nil,(lv+c:GetLevel())) + and Duel.IsExistingMatchingCard(s.desfilter,tp,0,LOCATION_MZONE,1,nil,(lv+c:GetLevel())) end function s.desfilter(c,lvl) return c:IsFaceup() and c:IsLevelBelow(lvl) and not c:IsMaximumModeSide() @@ -27,7 +27,7 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(s.costfilter,tp,LOCATION_HAND,0,1,nil,tp) end end function s.desfilter(c,lv) - return c:IsFaceup() and c:IsLevelBelow(lv) + return c:IsFaceup() and c:IsLevelBelow(lv) end function s.tgfilter(c,tp) return c:IsMonster() and c:IsRace(RACE_REPTILE) and c:IsAbleToGraveAsCost() @@ -45,7 +45,6 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) Duel.HintSelection(sg) Duel.Destroy(sg,REASON_EFFECT) end - end end function s.rescon(sg,e,tp,mg) diff --git a/rush/c160008054.lua b/rush/c160008054.lua index 1316a63ebc..693b800ad1 100644 --- a/rush/c160008054.lua +++ b/rush/c160008054.lua @@ -18,7 +18,7 @@ function s.filter2(c) return c:IsLevelBelow(8) and c:IsFaceup() end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.filter),tp,LOCATION_MZONE,0,2,nil) + if chk==0 then return Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.filter),tp,LOCATION_MZONE,0,2,nil) and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.filter2),tp,0,LOCATION_MZONE,1,nil) end end function s.activate(e,tp,eg,ep,ev,re,r,rp) diff --git a/rush/c160008056.lua b/rush/c160008056.lua index 98deedff57..c6381369c2 100644 --- a/rush/c160008056.lua +++ b/rush/c160008056.lua @@ -1,5 +1,5 @@ -- 閃駆雷撃 ---Trailblitzing Thunderbolt +--Trailblitzing Thunderblast local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160008060.lua b/rush/c160008060.lua index f6686b7c66..de45ac3a0b 100644 --- a/rush/c160008060.lua +++ b/rush/c160008060.lua @@ -30,7 +30,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetOperationInfo(0,CATEGORY_POSITION,eg:GetFirst(),1,0,0) end function s.filter(c) - return c:IsRace(RACE_WYRM) and c:IsFaceup() + return c:IsRace(RACE_WYRM) and c:IsFaceup() end function s.operation(e,tp,eg,ep,ev,re,r,rp) --Requirement @@ -41,7 +41,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) --Effect local tc=eg:GetFirst() Duel.ChangePosition(tc,POS_FACEDOWN_DEFENSE) - if Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.filter),tp,LOCATION_MZONE,0,1,nil) + if Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.filter),tp,LOCATION_MZONE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK) local tc2=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(s.filter),tp,LOCATION_MZONE,0,1,1,nil):GetFirst() diff --git a/rush/c160008061.lua b/rush/c160008061.lua index c96df6ed9e..ffd3214f72 100644 --- a/rush/c160008061.lua +++ b/rush/c160008061.lua @@ -1,5 +1,5 @@ -- 警告鱗光 --- Warning Scale Phosphorescence +--Wrath of Light local s,id=GetID() function s.initial_effect(c) --When your opponent normal/special summons a monster, prevent attack and shuffle monsters from the GY @@ -43,7 +43,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ge1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) ge1:SetTargetRange(0,LOCATION_MZONE) ge1:SetTarget(s.atktg) - ge1:SetReset(RESET_PHASE+PHASE_END) + ge1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(ge1,tp) local og=Duel.GetMatchingGroup(s.gyfilter,tp,LOCATION_GRAVE,0,nil) if #og>0 and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then diff --git a/rush/c160008062.lua b/rush/c160008062.lua index 4fc9acc9cb..a19fd88a90 100644 --- a/rush/c160008062.lua +++ b/rush/c160008062.lua @@ -1,4 +1,4 @@ ---最強闘志 +--最強闘志 -- Ultimate Fighting Spirit local s,id=GetID() diff --git a/rush/c160008063.lua b/rush/c160008063.lua index 47fe8d011c..fdb1e8e382 100644 --- a/rush/c160008063.lua +++ b/rush/c160008063.lua @@ -1,5 +1,5 @@ ---Sakuretsu Force --聖なる装甲 －炸裂フォース－ +--Sakuretsu Force local s,id=GetID() function s.initial_effect(c) --Opponent's attacking monster loses 400 ATK @@ -58,5 +58,5 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) end end function s.desfilter(c) - return c:IsFaceup() and c:IsPosition(POS_FACEUP_ATTACK) + return c:IsFaceup() and c:IsPosition(POS_FACEUP_ATTACK) end \ No newline at end of file diff --git a/rush/c160008065.lua b/rush/c160008065.lua index a8c35d2c8e..5cba6e610e 100644 --- a/rush/c160008065.lua +++ b/rush/c160008065.lua @@ -1,6 +1,5 @@ ---Maid's Present --- メイドの土産 - +--メイドの土産 +--Maid's Baneful Gift local s,id=GetID() function s.initial_effect(c) --Special summon 1 level 1 normal monster from GY @@ -35,7 +34,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) Duel.Draw(p,d,REASON_EFFECT) if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end if Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp) - and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then + and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) local sg=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp) if #sg>0 then diff --git a/rush/c160009014.lua b/rush/c160009014.lua index 3a6895175f..988683290c 100644 --- a/rush/c160009014.lua +++ b/rush/c160009014.lua @@ -1,5 +1,5 @@ --アストロレスキュー ---Astrorescue +--Astro Rescue --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) @@ -36,6 +36,6 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CANNOT_ATTACK) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(function(_,c) return c:IsType(TYPE_EFFECT) and c:IsLevelBelow(8) end) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end \ No newline at end of file diff --git a/rush/c160009015.lua b/rush/c160009015.lua index f5d8b6689e..f22ff33a53 100644 --- a/rush/c160009015.lua +++ b/rush/c160009015.lua @@ -26,7 +26,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) --Effect Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP) local tc=Duel.SelectMatchingCard(tp,aux.FaceupFilter(Card.IsRace,RACE_GALAXY),tp,LOCATION_MZONE,0,1,1,nil):GetFirst() - if tc then + if tc then Duel.HintSelection(tc,true) --Cannot be destroyed by opponent's trap local e1=Effect.CreateEffect(e:GetHandler()) diff --git a/rush/c160009016.lua b/rush/c160009016.lua index 74ba8a2f87..7ef48356e1 100644 --- a/rush/c160009016.lua +++ b/rush/c160009016.lua @@ -1,5 +1,5 @@ --トランザム・エフィライ ---Transamu Ephyrai +--Transam Ephyrai local s,id=GetID() function s.initial_effect(c) --"Transamu Rainac" gains 1000 ATK diff --git a/rush/c160009020.lua b/rush/c160009020.lua index e1a2959674..33b0c7afcc 100644 --- a/rush/c160009020.lua +++ b/rush/c160009020.lua @@ -1,5 +1,5 @@ --羊界プランユー ---Ewekai Planeau +--Wooly Wonderland Planewe --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160009021.lua b/rush/c160009021.lua index 7fed46b54a..89a0605952 100644 --- a/rush/c160009021.lua +++ b/rush/c160009021.lua @@ -1,5 +1,5 @@ --ことのはの妖精 ---Wording Fairy +--Poet Fairy --Substitute ID local s,id=GetID() diff --git a/rush/c160009022.lua b/rush/c160009022.lua index a7f83ffd67..ef60ba6e6b 100644 --- a/rush/c160009022.lua +++ b/rush/c160009022.lua @@ -29,7 +29,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET) local g=Duel.SelectMatchingCard(tp,s.setfilter,tp,LOCATION_GRAVE,0,1,1,nil) if #g==0 or Duel.SSet(tp,g)==0 or Duel.GetLocationCount(tp,LOCATION_MZONE)==0 then return end - local sg=Duel.GetMatchingGroup(s.spfilter,tp,LOCATION_HAND+LOCATION_GRAVE,0,nil,e,tp) + local sg=Duel.GetMatchingGroup(s.spfilter,tp,LOCATION_HAND|LOCATION_GRAVE,0,nil,e,tp) if #sg>0 and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) local sc=Group.Select(sg,tp,1,1,nil) diff --git a/rush/c160009024.lua b/rush/c160009024.lua index 3038dcb59b..be6becfd34 100644 --- a/rush/c160009024.lua +++ b/rush/c160009024.lua @@ -1,5 +1,5 @@ --パクチュ ---Packrat +--Pakupakuchu local s,id=GetID() function s.initial_effect(c) --Add to the hand diff --git a/rush/c160009025.lua b/rush/c160009025.lua index f78d80b7c0..c7690a207c 100644 --- a/rush/c160009025.lua +++ b/rush/c160009025.lua @@ -1,5 +1,5 @@ --貿績蚕フィブロン ---Swapling Silkworm Fibellon +--Swapling Silkworm Fibron --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160009027.lua b/rush/c160009027.lua index 2ff1dc8eb8..d4ce4115d7 100644 --- a/rush/c160009027.lua +++ b/rush/c160009027.lua @@ -50,7 +50,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CANNOT_ATTACK) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end end diff --git a/rush/c160009030.lua b/rush/c160009030.lua index 59091e6432..486c7b7484 100644 --- a/rush/c160009030.lua +++ b/rush/c160009030.lua @@ -20,8 +20,8 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(s.tdfilter,tp,LOCATION_GRAVE,0,1,nil) end end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return - Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,1,nil) + if chk==0 then return + Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,1,nil) end end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/rush/c160009036.lua b/rush/c160009036.lua index 986618c888..b3881e6b79 100644 --- a/rush/c160009036.lua +++ b/rush/c160009036.lua @@ -1,5 +1,5 @@ --翅甲王ディナス・ドルクス ---Bladearmor King Dynas Dorcus +--Dynas Dorcus the Beetle King --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) @@ -46,6 +46,6 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CANNOT_ATTACK) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(function(_,c) return not c:IsRace(RACE_INSECT) end) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end \ No newline at end of file diff --git a/rush/c160009046.lua b/rush/c160009046.lua index f2ad00b6e6..1bfeaad385 100644 --- a/rush/c160009046.lua +++ b/rush/c160009046.lua @@ -70,14 +70,14 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetCondition(s.atkcon) e1:SetTarget(s.atktg) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) local e2=Effect.CreateEffect(e:GetHandler()) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE) e2:SetCode(EVENT_ATTACK_ANNOUNCE) e2:SetOperation(s.checkop) - e2:SetReset(RESET_PHASE+PHASE_END) + e2:SetReset(RESET_PHASE|PHASE_END) e2:SetLabelObject(e1) Duel.RegisterEffect(e2,tp) end diff --git a/rush/c160009047.lua b/rush/c160009047.lua index ec059e3fef..a6ac8a4013 100644 --- a/rush/c160009047.lua +++ b/rush/c160009047.lua @@ -1,5 +1,5 @@ -- メ守破離剣 --- Shuhari Sword +--Defense Destroying Sword -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) @@ -41,6 +41,6 @@ function s.desop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CANNOT_ATTACK) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(function(e,c) return c:IsType(TYPE_EFFECT) end) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end \ No newline at end of file diff --git a/rush/c160009048.lua b/rush/c160009048.lua index 6a05d9bdc3..831f86266e 100644 --- a/rush/c160009048.lua +++ b/rush/c160009048.lua @@ -1,5 +1,5 @@ -- 先の兆し --- Opening Move Omen +--Telegraphed Strike local s,id=GetID() function s.initial_effect(c) -- Draw @@ -27,7 +27,7 @@ function s.drop(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.SelectMatchingCard(tp,s.drcostfilter,tp,LOCATION_HAND,0,1,1,nil):GetFirst() local g=Duel.GetMatchingGroup(s.cfilter,tp,LOCATION_MZONE,0,nil) if Duel.SendtoGrave(tc,REASON_COST)==1 and Duel.Draw(tp,1,REASON_EFFECT)>0 - and #g>1 and Duel.IsPlayerCanDraw(tp,1) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then + and #g>1 and Duel.IsPlayerCanDraw(tp,1) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then Duel.BreakEffect() Duel.Draw(tp,1,REASON_EFFECT) end diff --git a/rush/c160009049.lua b/rush/c160009049.lua index 9985a82ffb..19f7dd89d6 100644 --- a/rush/c160009049.lua +++ b/rush/c160009049.lua @@ -1,5 +1,5 @@ --お天道様の森 ---Forest of the Sun +--Sunny Forest local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160009051.lua b/rush/c160009051.lua index 70f6e44fd9..1e3efc128e 100644 --- a/rush/c160009051.lua +++ b/rush/c160009051.lua @@ -1,5 +1,5 @@ --イントルード・ビートル ---Intrude Beetle +--Intruding Beetles --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160009055.lua b/rush/c160009055.lua index ae530ef4d4..473657d105 100644 --- a/rush/c160009055.lua +++ b/rush/c160009055.lua @@ -1,5 +1,5 @@ --羊界－墓地に怨念 ---Ewekai - Grudges from the Grave +--Wooly Wonderland - Graveyard Grudge --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160009056.lua b/rush/c160009056.lua index df6d08d1de..9c33c68ec7 100644 --- a/rush/c160009056.lua +++ b/rush/c160009056.lua @@ -1,5 +1,5 @@ --吉兆の面 ---Mask of Good Omens +--Lucky Mask of Omens --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160009057.lua b/rush/c160009057.lua index 56dcd584fe..c72014a1ef 100644 --- a/rush/c160009057.lua +++ b/rush/c160009057.lua @@ -1,5 +1,5 @@ -- 手札増刷 --- Card Reprint +--Card Reprinting -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160009059.lua b/rush/c160009059.lua index 7af51669e7..ec5d431dfc 100644 --- a/rush/c160009059.lua +++ b/rush/c160009059.lua @@ -1,5 +1,5 @@ -- 破竜の咆鋼 --- Demolition Wyrm Roar +--Demolisher Wyrm Roar -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160009060.lua b/rush/c160009060.lua index fe0bc99699..8306f0ad05 100644 --- a/rush/c160009060.lua +++ b/rush/c160009060.lua @@ -1,5 +1,5 @@ -- 交剣死哀 --- Cross-Sword Deathmatch +--Climax Clash -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160009061.lua b/rush/c160009061.lua index 4cb1641dd9..6435a5f76f 100644 --- a/rush/c160009061.lua +++ b/rush/c160009061.lua @@ -1,5 +1,5 @@ -- 迎え突き！ --- Greeting Strike! +--Engage and Strike! -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160009063.lua b/rush/c160009063.lua index 14151b643e..c0d61538a2 100644 --- a/rush/c160009063.lua +++ b/rush/c160009063.lua @@ -1,5 +1,5 @@ --転倒無視 ---Tumbling Insects +--Ignoring Insect --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160010000.lua b/rush/c160010000.lua index 052398813e..d075e2aa2c 100644 --- a/rush/c160010000.lua +++ b/rush/c160010000.lua @@ -1,5 +1,5 @@ --アビス・ソルジャー ---Abyss Soldier (Rush Duel) +--Abyss Soldier (Rush) --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160010018.lua b/rush/c160010018.lua index e0c7470115..9402c9c734 100644 --- a/rush/c160010018.lua +++ b/rush/c160010018.lua @@ -1,5 +1,5 @@ --火葬犬ニトロ ---Cremation Dog Nitro +--Nitro Hound --scripted by Naim local s,id=GetID() function s.initial_effect(c) @@ -35,6 +35,6 @@ function s.damop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(function(_,c) return not c:IsRace(RACE_PYRO) end) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end \ No newline at end of file diff --git a/rush/c160010020.lua b/rush/c160010020.lua index 5abf2b1481..a1a5e00fa9 100644 --- a/rush/c160010020.lua +++ b/rush/c160010020.lua @@ -1,5 +1,5 @@ --ケミカライズ・サラマンダー ---Chemicalize Salamander +--Chemicalized Salamander --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160010023.lua b/rush/c160010023.lua index 68dac40223..e611f7b1f1 100644 --- a/rush/c160010023.lua +++ b/rush/c160010023.lua @@ -38,7 +38,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(400) tc:RegisterEffect(e1) tc:AddPiercing(RESETS_STANDARD_PHASE_END) diff --git a/rush/c160010024.lua b/rush/c160010024.lua index b96637fc01..aec133adb7 100644 --- a/rush/c160010024.lua +++ b/rush/c160010024.lua @@ -1,5 +1,5 @@ --ウルトラバイオレディ ---Ultra Bio Lady +--Ultra Violady --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160010025.lua b/rush/c160010025.lua index 4ffc4c8ff7..404778c2f9 100644 --- a/rush/c160010025.lua +++ b/rush/c160010025.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・レクイエム ---Voidvelgr Requiem +--Voidvelg Requiem --scripted by Naim local s,id=GetID() function s.initial_effect(c) @@ -33,14 +33,14 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(ct*300) c:RegisterEffect(e1) if Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsAttribute,ATTRIBUTE_LIGHT),tp,0,LOCATION_MZONE,1,nil) then local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_SINGLE) e2:SetCode(EFFECT_UPDATE_ATTACK) - e2:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e2:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e2:SetValue(600) c:RegisterEffect(e2) end diff --git a/rush/c160010026.lua b/rush/c160010026.lua index 9785df8341..4641873501 100644 --- a/rush/c160010026.lua +++ b/rush/c160010026.lua @@ -1,5 +1,5 @@ --羊界ウェーブシャーフ ---Ewekai Waveschaf +--Wooly Wonderland Wave Schaf --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160010027.lua b/rush/c160010027.lua index 083beff64d..a5794c0801 100644 --- a/rush/c160010027.lua +++ b/rush/c160010027.lua @@ -1,5 +1,5 @@ --地獄河童ダイウェット ---Hell Kappa Daiwet +--Pandemonium Kappa Dive Wet --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160010029.lua b/rush/c160010029.lua index 6e7f2e7be5..43847486c9 100644 --- a/rush/c160010029.lua +++ b/rush/c160010029.lua @@ -1,5 +1,5 @@ --御茶女邪神ヌヴィア ---Nuvia the Wicked Mischief Maker +--Nuvia the Mischievous --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160010030.lua b/rush/c160010030.lua index e68d48eea6..e416c9e445 100644 --- a/rush/c160010030.lua +++ b/rush/c160010030.lua @@ -1,5 +1,5 @@ --治療の神童 ディアン・ケト ---Dian Keto the Cure Maiden +--Dian Keto the Cure Prodigy --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160010031.lua b/rush/c160010031.lua index ab4fc48afd..c86637d8cc 100644 --- a/rush/c160010031.lua +++ b/rush/c160010031.lua @@ -1,5 +1,5 @@ --邪犬雷帝ドライヌ ---Wicked Dog Thunder Emperor Dorainu +--Mean Mutt Duke Doberguardian --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160010032.lua b/rush/c160010032.lua index c1e438e073..246d8672d4 100644 --- a/rush/c160010032.lua +++ b/rush/c160010032.lua @@ -1,5 +1,5 @@ --邪犬武闘神シバ ---Wicked Dog Warrior Deity Shiva +--Mean Mutt Sacred Shiba --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160010033.lua b/rush/c160010033.lua index 96f55f99db..12102beb28 100644 --- a/rush/c160010033.lua +++ b/rush/c160010033.lua @@ -37,7 +37,7 @@ function s.thfilter(c) end function s.posop(e,tp,eg,ep,ev,re,r,rp) --Requirement - Duel.PayLPCost(tp,700) + Duel.PayLPCost(tp,700) --Effect Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_POSCHANGE) local g=Duel.SelectMatchingCard(tp,s.filter,tp,0,LOCATION_MZONE,1,1,nil) diff --git a/rush/c160010046.lua b/rush/c160010046.lua index a930c5fedf..620ae53d35 100644 --- a/rush/c160010046.lua +++ b/rush/c160010046.lua @@ -1,5 +1,5 @@ --メロメロメェ～グ☆ウ～ルトラビーム ---Melo Melo Meeeg☆Uuultra Beam +--Beaming Bell Beam --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160010047.lua b/rush/c160010047.lua index 2bcb985c44..fa45fd7bf9 100644 --- a/rush/c160010047.lua +++ b/rush/c160010047.lua @@ -1,5 +1,5 @@ --雨に打たれれば ---Caught in the Rain +--Embracing the Rain --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160010048.lua b/rush/c160010048.lua index ad1da62ad0..e5ebe848cd 100644 --- a/rush/c160010048.lua +++ b/rush/c160010048.lua @@ -1,5 +1,5 @@ --アメガロポリス ---Rainy Megalopolis +--Rainapolis --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160010049.lua b/rush/c160010049.lua index ebf584c943..18dee1805e 100644 --- a/rush/c160010049.lua +++ b/rush/c160010049.lua @@ -1,5 +1,5 @@ --バブル・キングダム ---Bubble Kingdom +--Kingdom of Bubbles --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160010050.lua b/rush/c160010050.lua index f9b02e44a6..8df3174f07 100644 --- a/rush/c160010050.lua +++ b/rush/c160010050.lua @@ -1,5 +1,5 @@ --ワンダフル邪犬 ---Woofderful Heartless Hound +--Wolftastic Mean Mutt --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160010051.lua b/rush/c160010051.lua index 42faa31de0..96fdd378e8 100644 --- a/rush/c160010051.lua +++ b/rush/c160010051.lua @@ -1,5 +1,5 @@ --３００光年アカイマント ---300 Light-Year Red Cloak +--300 Light Year Red Cape --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160010054.lua b/rush/c160010054.lua index f245f73a66..827f316e8d 100644 --- a/rush/c160010054.lua +++ b/rush/c160010054.lua @@ -26,7 +26,7 @@ end function s.drop(e,tp,eg,ep,ev,re,r,rp) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) local tc=Duel.SelectMatchingCard(tp,s.drcostfilter,tp,LOCATION_HAND,0,1,1,nil):GetFirst() - if Duel.SendtoGrave(tc,REASON_COST)==1 and Duel.Draw(tp,1,REASON_EFFECT)>0 and tc:IsLocation(LOCATION_GRAVE) and Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsLevel,7),tp,0,LOCATION_MZONE,1,nil) and Duel.IsPlayerCanDraw(tp,1) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then + if Duel.SendtoGrave(tc,REASON_COST)==1 and Duel.Draw(tp,1,REASON_EFFECT)>0 and tc:IsLocation(LOCATION_GRAVE) and Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsLevel,7),tp,0,LOCATION_MZONE,1,nil) and Duel.IsPlayerCanDraw(tp,1) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then Duel.BreakEffect() Duel.Draw(tp,1,REASON_EFFECT) end diff --git a/rush/c160010055.lua b/rush/c160010055.lua index d30befe8d9..190b581aa4 100644 --- a/rush/c160010055.lua +++ b/rush/c160010055.lua @@ -28,7 +28,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,chk) if Duel.IsPlayerAffectedByEffect(tp,CARD_BLUEEYES_SPIRIT) then ft=1 end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_HAND,0,1,math.min(ft,3),nil,e,tp) - if #g>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)>0 + if #g>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)>0 and Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsAttribute,ATTRIBUTE_WATER),tp,LOCATION_MZONE,0,3,nil) and Duel.IsPlayerCanDraw(tp,1) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then diff --git a/rush/c160010056.lua b/rush/c160010056.lua index 154ee7d39f..ee52cb70bf 100644 --- a/rush/c160010056.lua +++ b/rush/c160010056.lua @@ -39,7 +39,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) Duel.ShuffleDeck(tp) --Effect local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) - if Duel.Draw(p,d,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_MZONE,0,1,nil) + if Duel.Draw(p,d,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_MZONE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATKDEF) local ag=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_MZONE,0,1,1,nil) diff --git a/rush/c160010057.lua b/rush/c160010057.lua index 6a76691e43..6b9f7219f3 100644 --- a/rush/c160010057.lua +++ b/rush/c160010057.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) c:RegisterEffect(e1) end function s.cfilter(c) - return c:IsMonster() and c:IsAbleToDeckOrExtraAsCost() + return c:IsMonster() and c:IsAbleToDeckOrExtraAsCost() end function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_GRAVE,0,2,nil) end @@ -51,12 +51,12 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetReset(RESETS_STANDARD_PHASE_END) g:GetFirst():RegisterEffect(e1) if Duel.GetMatchingGroupCount(Card.IsSpell,c:GetControler(),0,LOCATION_GRAVE,nil)>4 - and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.desfilter),tp,0,LOCATION_MZONE,1,nil) + and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.desfilter),tp,0,LOCATION_MZONE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then local tg=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(s.desfilter),tp,0,LOCATION_MZONE,1,1,nil) - if #tg>0 then + if #tg>0 then tg=tg:AddMaximumCheck() - Duel.Destroy(tg,REASON_EFFECT) + Duel.Destroy(tg,REASON_EFFECT) end end end \ No newline at end of file diff --git a/rush/c160010062.lua b/rush/c160010062.lua index fbe5d533cc..66511da565 100644 --- a/rush/c160010062.lua +++ b/rush/c160010062.lua @@ -1,5 +1,5 @@ --へのかっぱ ---Kappa's Gas +--Kappa's Blast --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160010063.lua b/rush/c160010063.lua index c917a5cfb3..e9df4a42d0 100644 --- a/rush/c160010063.lua +++ b/rush/c160010063.lua @@ -1,5 +1,5 @@ --ゲッコーの３不思議 ---The Three Moonlit Mystery Geckos +--Three Lunar Legends --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160010101.lua b/rush/c160010101.lua index 3ce202b24e..80cd9fe20a 100644 --- a/rush/c160010101.lua +++ b/rush/c160010101.lua @@ -1,5 +1,5 @@ --碧牙の爆速竜 ---Blue-Tooth Burst Dragon +--Blue-Fang Burst Dragon --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160011012.lua b/rush/c160011012.lua index bd259e54a3..ce1a8a88ad 100644 --- a/rush/c160011012.lua +++ b/rush/c160011012.lua @@ -1,5 +1,5 @@ --ランプの炎皇アルコ ---Alco the Flame Emperor of the Lamp +--Alkyl the Flame Emperor of the Lamp --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160011014.lua b/rush/c160011014.lua index 2a69858c2c..cf54566bd3 100644 --- a/rush/c160011014.lua +++ b/rush/c160011014.lua @@ -22,7 +22,7 @@ function s.filter(c) return c:IsFaceup() and c:GetBaseAttack()>0 and c:IsLevelBelow(8) and c:IsAttribute(ATTRIBUTE_EARTH) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return Duel.IsExistingMatchingCard(s.costfilter,tp,LOCATION_MZONE,0,1,e:GetHandler()) + if chk==0 then return Duel.IsExistingMatchingCard(s.costfilter,tp,LOCATION_MZONE,0,1,e:GetHandler()) and Duel.IsExistingMatchingCard(Card.IsFacedown,tp,0,LOCATION_MZONE,1,nil) end end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/rush/c160011020.lua b/rush/c160011020.lua index 669fc3f750..d618c575bf 100644 --- a/rush/c160011020.lua +++ b/rush/c160011020.lua @@ -21,7 +21,7 @@ function s.drcon(e,tp,eg,ep,ev,re,r,rp) end function s.drtg(e,tp,eg,ep,ev,re,r,rp,chk) local ct=Duel.GetFieldGroupCount(tp,LOCATION_HAND,0) - local ct2=Duel.GetFieldGroupCount(1-tp,LOCATION_HAND,0) + local ct2=Duel.GetFieldGroupCount(1-tp,LOCATION_HAND,0) if ct==0 and ct2==0 then if chk==0 then return Duel.IsPlayerCanDraw(tp,1) and Duel.IsPlayerCanDraw(1-tp,1) end Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,PLAYER_ALL,1) diff --git a/rush/c160011027.lua b/rush/c160011027.lua index 45caf17552..42e0cb77d6 100644 --- a/rush/c160011027.lua +++ b/rush/c160011027.lua @@ -47,7 +47,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetValue(400) e1:SetReset(RESETS_STANDARD_PHASE_END) tc:RegisterEffect(e1) - if not (Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,LOCATION_MZONE,0,1,nil) + if not (Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,LOCATION_MZONE,0,1,nil) and Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsSpell),tp,LOCATION_ONFIELD,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1))) then return end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATKDEF) diff --git a/rush/c160011031.lua b/rush/c160011031.lua index 1e6701c2b2..dc02be44fa 100644 --- a/rush/c160011031.lua +++ b/rush/c160011031.lua @@ -1,5 +1,5 @@ --フィーラン・ドワーフ ---Phillan Dwarf +--Philan Dwarf --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160011036.lua b/rush/c160011036.lua index d9582392a4..bb8162abf2 100644 --- a/rush/c160011036.lua +++ b/rush/c160011036.lua @@ -45,7 +45,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(1400) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) c:RegisterEffect(e1) end end diff --git a/rush/c160011041.lua b/rush/c160011041.lua index a3a5e11366..8520d3ae59 100644 --- a/rush/c160011041.lua +++ b/rush/c160011041.lua @@ -1,5 +1,5 @@ --ジョインテック・ラッシュホーン ---Jointech Rushhorn +--Jointech Rush Horn --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160011044.lua b/rush/c160011044.lua index c97ee10a22..a5280e5794 100644 --- a/rush/c160011044.lua +++ b/rush/c160011044.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・テュルフィング ---Voidvelgr Tyrfing +--Voidvelg Tyrfing --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160011056.lua b/rush/c160011056.lua index e2191328c3..f1fcd313e9 100644 --- a/rush/c160011056.lua +++ b/rush/c160011056.lua @@ -1,5 +1,5 @@ --吹き抜ける風 ---The Wind Blowing Through +--Atrium's Wind --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160011059.lua b/rush/c160011059.lua index 1aea25fe3a..135ff61ae3 100644 --- a/rush/c160011059.lua +++ b/rush/c160011059.lua @@ -1,5 +1,5 @@ --昇陣の装備品 ---Armaments of Ascension +--Equipment of Ascension --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160012006.lua b/rush/c160012006.lua index a4fdcdb5e1..b233ba0116 100644 --- a/rush/c160012006.lua +++ b/rush/c160012006.lua @@ -1,5 +1,5 @@ --ジョインテック・ブリキノサウルス ---Jointech Tinplatesaurus +--Jointech Tinosaurus --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160012008.lua b/rush/c160012008.lua index 4d8b0e60f1..7d056ba22e 100644 --- a/rush/c160012008.lua +++ b/rush/c160012008.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・カタフラクトス ---Voidvelgr Kataphraktos +--Voidvelg Kataphraktos --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160012009.lua b/rush/c160012009.lua index 73330aa7e3..cae3cd7139 100644 --- a/rush/c160012009.lua +++ b/rush/c160012009.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・ブラックドワーフ ---Voidvelgr Black Dwarf +--Voidvelg Black Dwarf --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160012019.lua b/rush/c160012019.lua index 14f14e8f35..bfe11de479 100644 --- a/rush/c160012019.lua +++ b/rush/c160012019.lua @@ -1,5 +1,5 @@ --エクスキューティー・フラーメ ---Excutie Flame +--Executie Flame --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160012029.lua b/rush/c160012029.lua index 44493e132d..dc388b4be6 100644 --- a/rush/c160012029.lua +++ b/rush/c160012029.lua @@ -1,5 +1,5 @@ --ギルフォード・ザ・レジェンド ---Gilford the Legend +--Gilford the Legend (Rush) --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160012033.lua b/rush/c160012033.lua index a11174639f..10990888d9 100644 --- a/rush/c160012033.lua +++ b/rush/c160012033.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・プロトスター ---Voidvelgr Protostar +--Voidvelg Protostar --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160012035.lua b/rush/c160012035.lua index 1f8034f3d7..43c68b5403 100644 --- a/rush/c160012035.lua +++ b/rush/c160012035.lua @@ -1,5 +1,5 @@ --ザ☆ドラギアスター ---The☆Dragiastar +--The Dragiastar --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160012042.lua b/rush/c160012042.lua index 0d96b570b9..1735b585c3 100644 --- a/rush/c160012042.lua +++ b/rush/c160012042.lua @@ -1,5 +1,5 @@ --ステマジック ---Stemagic +--Stealthagic --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160012044.lua b/rush/c160012044.lua index 17e1e96f36..5dee860776 100644 --- a/rush/c160012044.lua +++ b/rush/c160012044.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・ファランクス ---Voidvelgr Phalanx +--Voidvelg Phalanx --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160012046.lua b/rush/c160012046.lua index 0cda238139..f56a30e0ce 100644 --- a/rush/c160012046.lua +++ b/rush/c160012046.lua @@ -1,5 +1,5 @@ --ザ☆コピ ---The☆Copy +--The Copy --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160012049.lua b/rush/c160012049.lua index 116d3e55ff..10f99a5546 100644 --- a/rush/c160012049.lua +++ b/rush/c160012049.lua @@ -1,5 +1,5 @@ --ニャンダフル・ラッシュ ---Meowonderful Rush +--Nyanderful Rush --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160012053.lua b/rush/c160012053.lua index 737d28769d..6cc9ba3051 100644 --- a/rush/c160012053.lua +++ b/rush/c160012053.lua @@ -1,5 +1,5 @@ --蒼救の照覧 ---Skysavior Witnesses +--Skysavior Watch --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160012056.lua b/rush/c160012056.lua index 180aabbf33..dbaf40016e 100644 --- a/rush/c160012056.lua +++ b/rush/c160012056.lua @@ -1,5 +1,5 @@ --トランザム・ライトニング ---Transamu Lightning +--Transam Lightning --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160012065.lua b/rush/c160012065.lua index 6bd6a9ea94..2cf2aed16f 100644 --- a/rush/c160012065.lua +++ b/rush/c160012065.lua @@ -47,7 +47,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) dg=dg:AddMaximumCheck() if #dg>0 then Duel.HintSelection(dg) - if Duel.Destroy(dg,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,1,nil) + if Duel.Destroy(dg,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP) local sg=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,1,1,nil) diff --git a/rush/c160013006.lua b/rush/c160013006.lua index 2e15fa210f..3a6253df34 100644 --- a/rush/c160013006.lua +++ b/rush/c160013006.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・キリエ ---Voidvelgr Kyrie +--Voidvelg Kyrie --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160013007.lua b/rush/c160013007.lua index 83125efa18..f42196a480 100644 --- a/rush/c160013007.lua +++ b/rush/c160013007.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・ロジスティコス ---Voidvelgr Logistikos +--Voidvelg Logistikos --scritped by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160013008.lua b/rush/c160013008.lua index 513b467bfd..04d57e4113 100644 --- a/rush/c160013008.lua +++ b/rush/c160013008.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・クリュサオル ---Voidvelgr Chrysaor +--Voidvelg Chrysaor --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160013022.lua b/rush/c160013022.lua index 177c44b1a9..3cbe425728 100644 --- a/rush/c160013022.lua +++ b/rush/c160013022.lua @@ -50,5 +50,5 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) Duel.RegisterEffect(e1,tp) end function s.sumlimit(e,c) - return c:IsLocation(LOCATION_HAND+LOCATION_GRAVE) + return c:IsLocation(LOCATION_HAND|LOCATION_GRAVE) end \ No newline at end of file diff --git a/rush/c160013031.lua b/rush/c160013031.lua index b5b52bc54d..760400e41f 100644 --- a/rush/c160013031.lua +++ b/rush/c160013031.lua @@ -1,5 +1,5 @@ --ＥＸプローラー ---EXTRApoler +--EXTRAplorer --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160013032.lua b/rush/c160013032.lua index 92099441e0..810a27343c 100644 --- a/rush/c160013032.lua +++ b/rush/c160013032.lua @@ -1,5 +1,5 @@ --顕現術師ドルテオ ---Manifestation Master Dortheo +--Summoning Sorcerer Doretheo --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160013037.lua b/rush/c160013037.lua index 3c1f5e8b38..f2ce98e345 100644 --- a/rush/c160013037.lua +++ b/rush/c160013037.lua @@ -1,5 +1,5 @@ --碧牙の超越爆速竜 ---Blue Tooth Enhanced Burst Dragon +--Blue-Fang Enhanced Burst Dragon --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160013039.lua b/rush/c160013039.lua index b5bdff9b16..8f2bfd679e 100644 --- a/rush/c160013039.lua +++ b/rush/c160013039.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・テオゴニア ---Voidvelgr Theogonia +--Voidvelg Theogonia --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160013040.lua b/rush/c160013040.lua index e6c4577733..37a7c43213 100644 --- a/rush/c160013040.lua +++ b/rush/c160013040.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・ギガントマキア ---Voidvelgr Gigantomachia +--Voidvelg Gigantomachia --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160013050.lua b/rush/c160013050.lua index a5610ea816..8a2229d436 100644 --- a/rush/c160013050.lua +++ b/rush/c160013050.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・グリンブルスティ ---Voidvelgr Gullinbursti +--Voidvelg Gullinbursti --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160013051.lua b/rush/c160013051.lua index b1603677ba..a4a9fed7d2 100644 --- a/rush/c160013051.lua +++ b/rush/c160013051.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・シュラウド ---Voidvelgr Shroud +--Voidvelg Shroud --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160013053.lua b/rush/c160013053.lua index 4732ee265d..bd54c314f4 100644 --- a/rush/c160013053.lua +++ b/rush/c160013053.lua @@ -1,5 +1,5 @@ --カリス魔杖デス・ワンド ---Magic Scepter of Charis - Death Wand +--Charis Magic Scepter - Death Wand --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160013055.lua b/rush/c160013055.lua index bd35dfbe60..b1972f3bae 100644 --- a/rush/c160013055.lua +++ b/rush/c160013055.lua @@ -1,5 +1,5 @@ --魔導槍グレイス・スピア ---Grace Spear the Magical Spear +--Magical Lance - Grace Spear --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160014006.lua b/rush/c160014006.lua index 84ee4c8b41..6167e31772 100644 --- a/rush/c160014006.lua +++ b/rush/c160014006.lua @@ -1,5 +1,5 @@ --ジョインテック・アークスコーピオ ---Jointech Arc Scorpio +--Jointech Arcscorpio --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -20,7 +20,7 @@ function s.tgfilter(c) return c:IsMonster() and c:IsRace(RACE_MACHINE) and c:IsAbleToGraveAsCost() and (c:IsLocation(LOCATION_HAND) or c:IsFaceup()) end function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return Duel.IsExistingMatchingCard(s.tgfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,1,nil) end + if chk==0 then return Duel.IsExistingMatchingCard(s.tgfilter,tp,LOCATION_HAND|LOCATION_MZONE,0,1,nil) end end function s.thfilter(c) return c:IsCode(CARD_FUSION,37630732) and c:IsAbleToHand() @@ -36,7 +36,7 @@ end function s.operation(e,tp,eg,ep,ev,re,r,rp) --Requirement Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) - local tg=Duel.SelectMatchingCard(tp,s.tgfilter,tp,LOCATION_HAND+LOCATION_MZONE,0,1,1,nil) + local tg=Duel.SelectMatchingCard(tp,s.tgfilter,tp,LOCATION_HAND|LOCATION_MZONE,0,1,1,nil) if Duel.SendtoGrave(tg,REASON_COST)==0 then return end --Effect Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) diff --git a/rush/c160014009.lua b/rush/c160014009.lua index 46d9c8681f..e9b29f24da 100644 --- a/rush/c160014009.lua +++ b/rush/c160014009.lua @@ -1,5 +1,5 @@ --ケミスペット・ニャンコ ---Chemispet Nyanko +--Chemipet Purr local s,id=GetID() function s.initial_effect(c) --Gain LP @@ -16,7 +16,7 @@ function s.initial_effect(c) c:RegisterEffect(e1) end function s.cfilter(c) - return c:IsMonster() and c:IsRace(RACE_PYRO|RACE_AQUA|RACE_THUNDER) + return c:IsMonster() and c:IsRace(RACE_PYRO|RACE_AQUA|RACE_THUNDER) end function s.condition(e,tp,eg,ep,ev,re,r,rp) return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_GRAVE,0,1,nil) @@ -32,7 +32,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetPossibleOperationInfo(0,CATEGORY_TODECK,nil,0,tp,LOCATION_GRAVE) end function s.tdfilter(c) - return c:IsAbleToDeck() and c:IsMonster() and c:IsRace(RACE_PYRO|RACE_AQUA|RACE_THUNDER) + return c:IsAbleToDeck() and c:IsMonster() and c:IsRace(RACE_PYRO|RACE_AQUA|RACE_THUNDER) end function s.operation(e,tp,eg,ep,ev,re,r,rp) --Requirement diff --git a/rush/c160014010.lua b/rush/c160014010.lua index 279305890d..0e30bf3e58 100644 --- a/rush/c160014010.lua +++ b/rush/c160014010.lua @@ -1,5 +1,5 @@ --ケミスペット・ワンコ ---Chemispet Wanko +--Chemipet Woof --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160014011.lua b/rush/c160014011.lua index 02944c07db..ec0a4965d7 100644 --- a/rush/c160014011.lua +++ b/rush/c160014011.lua @@ -1,5 +1,5 @@ --水溶精メルト ---Melt the Aqueous Spirit +--Melt the Aqueous Fairy local s,id=GetID() function s.initial_effect(c) --Add 1 Level 7/10 Pyro/Thunder monster to the hand diff --git a/rush/c160014012.lua b/rush/c160014012.lua index 7860074f8d..6b840193c9 100644 --- a/rush/c160014012.lua +++ b/rush/c160014012.lua @@ -1,5 +1,5 @@ --電導精ボルト ---Bolt the Conduction Spirit +--Volt the Electrical Fairy local s,id=GetID() function s.initial_effect(c) --Add 1 Level 5/10 Pyro/Aqua monster to the hand diff --git a/rush/c160014013.lua b/rush/c160014013.lua index f0c6699edc..db739b8e30 100644 --- a/rush/c160014013.lua +++ b/rush/c160014013.lua @@ -1,5 +1,5 @@ --火燃精ホット ---Hot the Combustion Spirit +--Hot the Combustible Fairy local s,id=GetID() function s.initial_effect(c) --Send the top 3 cards of your Deck to the GY and draw 1 card diff --git a/rush/c160014014.lua b/rush/c160014014.lua index f6fb816619..a4d2b42ddb 100644 --- a/rush/c160014014.lua +++ b/rush/c160014014.lua @@ -1,5 +1,5 @@ --ＨＰアシスタント・アーチ ---Hyper Assistant Achi +--Ember the Hyper Assistant local s,id=GetID() function s.initial_effect(c) --Special Summon 1 Level 7 or higher Pyro from the hand diff --git a/rush/c160014015.lua b/rush/c160014015.lua index d26ed6798d..88c5815a2a 100644 --- a/rush/c160014015.lua +++ b/rush/c160014015.lua @@ -47,10 +47,10 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) if e:GetHandler():IsMaximumMode() and #sg>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) local tg=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(Card.IsMonster),tp,0,LOCATION_MZONE,1,1,nil) - if #tg>0 then + if #tg>0 then tg=tg:AddMaximumCheck() Duel.HintSelection(tg,true) - Duel.Destroy(tg,REASON_EFFECT) + Duel.Destroy(tg,REASON_EFFECT) end end end diff --git a/rush/c160014018.lua b/rush/c160014018.lua index 255c54e8d1..83d1e4d4a4 100644 --- a/rush/c160014018.lua +++ b/rush/c160014018.lua @@ -1,5 +1,5 @@ --秘密捜査官ミスキャスト ---Secret Investigator Miscast +--Agent Miscast --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160014019.lua b/rush/c160014019.lua index 51cf980102..ccf5bf78e6 100644 --- a/rush/c160014019.lua +++ b/rush/c160014019.lua @@ -1,5 +1,5 @@ --秘密捜査官ミステイク ---Secret Investigator Mistake +--Agent Mistake --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160014020.lua b/rush/c160014020.lua index d78c933333..479d1328c6 100644 --- a/rush/c160014020.lua +++ b/rush/c160014020.lua @@ -1,5 +1,5 @@ --秘密捜査官ミスマッチ ---Secret Investigator Mismatch +--Agent Mismatch --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160014021.lua b/rush/c160014021.lua index beba9e1b69..270f6568e4 100644 --- a/rush/c160014021.lua +++ b/rush/c160014021.lua @@ -1,5 +1,5 @@ --秘密捜査官ミスリード ---Secret Investigator Mislead +--Agent Mislead --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -33,7 +33,7 @@ end function s.operation(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() --requirement - Duel.PayLPCost(tp,300) + Duel.PayLPCost(tp,300) --effect Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_POSCHANGE) local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil) diff --git a/rush/c160014022.lua b/rush/c160014022.lua index 671b8db17f..bbbae85d29 100644 --- a/rush/c160014022.lua +++ b/rush/c160014022.lua @@ -1,5 +1,5 @@ --エリート秘密捜査官ミステリー ---Elite Secret Investigator Mystery +--Elite Agent Mystery --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160014024.lua b/rush/c160014024.lua index 92831dcdfd..0c5c487716 100644 --- a/rush/c160014024.lua +++ b/rush/c160014024.lua @@ -40,7 +40,7 @@ function s.drop(e,tp,eg,ep,ev,re,r,rp) if #g>0 and Duel.SendtoGrave(g,REASON_COST)>0 then --Effect local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) - if Duel.Draw(p,d,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) + if Duel.Draw(p,d,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) local g2=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,1,nil) diff --git a/rush/c160014025.lua b/rush/c160014025.lua index 23d84a2308..0a6a723e58 100644 --- a/rush/c160014025.lua +++ b/rush/c160014025.lua @@ -42,7 +42,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK) local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.filter),tp,0,LOCATION_GRAVE,1,3,nil) Duel.HintSelection(g,true) - if #g>0 and Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) + if #g>0 and Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) local g2=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,1,nil) diff --git a/rush/c160014030.lua b/rush/c160014030.lua index 8b711e0eb4..5ef7489a08 100644 --- a/rush/c160014030.lua +++ b/rush/c160014030.lua @@ -53,7 +53,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local sg=dg:Select(tp,1,1,nil) Duel.HintSelection(sg,true) Duel.Destroy(sg,REASON_EFFECT) - if Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_GRAVE,0,1,nil,CARD_GAIA_CHAMPION) + if Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_GRAVE,0,1,nil,CARD_GAIA_CHAMPION) and Duel.IsExistingMatchingCard(nil,tp,0,LOCATION_ONFIELD,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) diff --git a/rush/c160014032.lua b/rush/c160014032.lua index bbfc538390..9fb95c1df5 100644 --- a/rush/c160014032.lua +++ b/rush/c160014032.lua @@ -1,5 +1,5 @@ --歴戦の暗黒騎士ガイア ---Veteran Gaia the Fierce Knight +--Battletested Gaia The Fierce Knight --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160014034.lua b/rush/c160014034.lua index 6c750d9e60..1f1043e420 100644 --- a/rush/c160014034.lua +++ b/rush/c160014034.lua @@ -27,7 +27,7 @@ function s.atkfilter(c) end function s.operation(e,tp,eg,ep,ev,re,r,rp) if Duel.DiscardDeck(tp,2,REASON_EFFECT)==0 then return end - if Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.atkfilter),tp,0,LOCATION_MZONE,1,nil) + if Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.atkfilter),tp,0,LOCATION_MZONE,1,nil) and Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_GRAVE,0,1,nil,14315573) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATKDEF) diff --git a/rush/c160014035.lua b/rush/c160014035.lua index 0dd4d6137a..8f01b9cd4c 100644 --- a/rush/c160014035.lua +++ b/rush/c160014035.lua @@ -1,5 +1,5 @@ --天始の怪依 ---The Strange Specter of Celestial Starts +--Specter of Heaven's Beginning --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160014037.lua b/rush/c160014037.lua index 2275f5a1b4..d1358f75e0 100644 --- a/rush/c160014037.lua +++ b/rush/c160014037.lua @@ -1,5 +1,5 @@ --昂光天使エッセル ---Rising Light Angel Esser +--Rising Light Angel Essel --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160014039.lua b/rush/c160014039.lua index 99d8b78ead..2b38adb9d5 100644 --- a/rush/c160014039.lua +++ b/rush/c160014039.lua @@ -1,5 +1,5 @@ --竜骸のプシュケラ ---Dino Skeleton Pushcera +--Dino Fossil Psycera --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -20,7 +20,7 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsPlayerCanDiscardDeckAsCost(tp,2) end end function s.cfilter(c) - return c:IsMonster() and c:IsRace(RACE_DINOSAUR) and c:IsType(TYPE_NORMAL) + return c:IsMonster() and c:IsRace(RACE_DINOSAUR) and c:IsType(TYPE_NORMAL) end function s.condition(e,tp,eg,ep,ev,re,r,rp) return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_GRAVE,0,1,nil) diff --git a/rush/c160014043.lua b/rush/c160014043.lua index 6e147dfbd9..70760faee4 100644 --- a/rush/c160014043.lua +++ b/rush/c160014043.lua @@ -19,7 +19,7 @@ function s.initial_effect(c) end s.listed_names={160014008,160312010} --Jointech Hero, Jointech Ace function s.spfilter(c,e,tp) - return c:IsLevel(7) and c:IsRace(RACE_MACHINE) and c:IsAttribute(ATTRIBUTE_EARTH) + return c:IsLevel(7) and c:IsRace(RACE_MACHINE) and c:IsAttribute(ATTRIBUTE_EARTH) and (c:IsAbleToHand() or (Duel.GetMZoneCount(tp)>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false))) end function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/rush/c160014046.lua b/rush/c160014046.lua index 634f79665f..2612e86de0 100644 --- a/rush/c160014046.lua +++ b/rush/c160014046.lua @@ -1,5 +1,5 @@ --百戦の覇者ガイア ---Gaia the Battle Ruler +--Gaia, Conqueror of Champions --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160014047.lua b/rush/c160014047.lua index b3bc8f2594..65f4b0875f 100644 --- a/rush/c160014047.lua +++ b/rush/c160014047.lua @@ -46,7 +46,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) end if Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.SendtoGrave(g,REASON_EFFECT) - else + else local ct=#g if ct>0 then Duel.MoveToDeckTop(g,tp) diff --git a/rush/c160014048.lua b/rush/c160014048.lua index 70f33c3213..3960b9db15 100644 --- a/rush/c160014048.lua +++ b/rush/c160014048.lua @@ -46,7 +46,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) Duel.ShuffleDeck(tp) --Effect local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) - if Duel.Draw(p,d,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_ONFIELD,0,1,nil) + if Duel.Draw(p,d,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_ONFIELD,0,1,nil) and Duel.IsPlayerCanDraw(tp,1) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.BreakEffect() Duel.Draw(tp,1,REASON_EFFECT) diff --git a/rush/c160014052.lua b/rush/c160014052.lua index 4f149c536c..37d1271371 100644 --- a/rush/c160014052.lua +++ b/rush/c160014052.lua @@ -1,5 +1,5 @@ --モンスター招集 ---Monster Convocation +--Monster Calling --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -31,7 +31,7 @@ end function s.drop(e,tp,eg,ep,ev,re,r,rp) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) local tc=Duel.SelectMatchingCard(tp,s.drcostfilter,tp,LOCATION_HAND,0,1,1,nil):GetFirst() - if Duel.SendtoGrave(tc,REASON_COST)==1 and Duel.Draw(tp,1,REASON_EFFECT)>0 then + if Duel.SendtoGrave(tc,REASON_COST)==1 and Duel.Draw(tp,1,REASON_EFFECT)>0 then local g=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.spfilter),tp,LOCATION_GRAVE,0,nil,e,tp) if #g>0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) diff --git a/rush/c160014058.lua b/rush/c160014058.lua index fba0a9480e..10a55e3917 100644 --- a/rush/c160014058.lua +++ b/rush/c160014058.lua @@ -18,7 +18,7 @@ end function s.condition(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetAttackTarget() local ac=Duel.GetAttacker() - return tc and tc:IsFaceup() and tc:IsControler(tp) and ac:IsControler(1-tp) + return tc and tc:IsFaceup() and tc:IsControler(tp) and ac:IsControler(1-tp) and tc:IsRace(RACE_MACHINE) and tc:IsAttribute(ATTRIBUTE_EARTH) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/rush/c160014062.lua b/rush/c160014062.lua index 749710f9e1..ed16cbaee9 100644 --- a/rush/c160014062.lua +++ b/rush/c160014062.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) end s.listed_names={CARD_GAIA_CHAMPION} function s.cfilter(c,tp) - return c:GetReasonPlayer()==1-tp and c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousControler(tp) + return c:GetReasonPlayer()==1-tp and c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousControler(tp) and (c:IsReason(REASON_EFFECT) or (c:IsReason(REASON_BATTLE) and Duel.GetAttacker():IsControler(1-tp))) end function s.condition(e,tp,eg,ep,ev,re,r,rp) diff --git a/rush/c160014064.lua b/rush/c160014064.lua index f09cee59ea..96502039f6 100644 --- a/rush/c160014064.lua +++ b/rush/c160014064.lua @@ -1,5 +1,5 @@ --エクスキューティー・ライディング！ ---Excutie Riding! +--Executie Riding! --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -41,7 +41,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local atk=eg:Filter(s.cfilter,nil,e,tp):GetMaxGroup(Card.GetAttack):GetFirst():GetAttack() Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp,atk) - if #g>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP_ATTACK)>0 + if #g>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP_ATTACK)>0 and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.atkfilter),tp,0,LOCATION_MZONE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATKDEF) diff --git a/rush/c160014135.lua b/rush/c160014135.lua index a1acc311e0..aca687c733 100644 --- a/rush/c160014135.lua +++ b/rush/c160014135.lua @@ -1,3 +1,3 @@ --天始の怪依 ---The Strange Specter of Celestial Starts +--Specter of Heaven's Beginning Duel.LoadCardScriptAlias(160014035) \ No newline at end of file diff --git a/rush/c160014137.lua b/rush/c160014137.lua index b0933cb350..d085a75bc9 100644 --- a/rush/c160014137.lua +++ b/rush/c160014137.lua @@ -1,3 +1,3 @@ --昂光天使エッセル ---Rising Light Angel Esser +--Rising Light Angel Essel Duel.LoadCardScriptAlias(160014037) \ No newline at end of file diff --git a/rush/c160015004.lua b/rush/c160015004.lua index e1d127af8d..1ad3a06937 100644 --- a/rush/c160015004.lua +++ b/rush/c160015004.lua @@ -1,5 +1,5 @@ --ダークネス・トランザム・クライシス ---Darkness Transamu Craisis +--Darkness Transam Craisis --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160015005.lua b/rush/c160015005.lua index 3f3d176334..3ec1f89993 100644 --- a/rush/c160015005.lua +++ b/rush/c160015005.lua @@ -38,7 +38,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_HAND,0,1,1,nil,e,tp) - if #g>0 + if #g>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP_DEFENSE)>0 and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_GRAVE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then diff --git a/rush/c160015008.lua b/rush/c160015008.lua index b1ae51669d..7feb95e17b 100644 --- a/rush/c160015008.lua +++ b/rush/c160015008.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) end s.listed_names={CARD_CELEB_ROSE_MAGICIAN,CARD_CELEB_ROSE_WITCH,CARD_FUSION} function s.condition(e,tp,eg,ep,ev,re,r,rp) - return e:GetHandler():IsStatus(STATUS_SUMMON_TURN) + return e:GetHandler():IsStatus(STATUS_SUMMON_TURN) end function s.revfilter(c) return ((c:IsRace(RACE_SPELLCASTER) and c:IsAttribute(ATTRIBUTE_LIGHT) diff --git a/rush/c160015010.lua b/rush/c160015010.lua index 01f8e874f4..3792cff433 100644 --- a/rush/c160015010.lua +++ b/rush/c160015010.lua @@ -25,7 +25,7 @@ function s.posfilter(c) return c:IsLevelBelow(9) and c:IsCanTurnSet() and c:IsCanChangePositionRush() end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return Duel.IsExistingMatchingCard(s.posfilter,tp,0,LOCATION_MZONE,1,nil) + if chk==0 then return Duel.IsExistingMatchingCard(s.posfilter,tp,0,LOCATION_MZONE,1,nil) and Duel.GetFieldGroupCount(tp,0,LOCATION_DECK)>=3 end Duel.SetOperationInfo(0,CATEGORY_POSITION,nil,1,0,0) end diff --git a/rush/c160015015.lua b/rush/c160015015.lua index 5cc475a747..9dbecc6e88 100644 --- a/rush/c160015015.lua +++ b/rush/c160015015.lua @@ -27,7 +27,7 @@ end function s.operation(e,tp,eg,ep,ev,re,r,rp) --Effect if Duel.DiscardDeck(tp,2,REASON_EFFECT)==0 then return end - if Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_MZONE,0,1,nil) + if Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_MZONE,0,1,nil) and Duel.IsExistingMatchingCard(Card.IsSpellTrap,tp,0,LOCATION_ONFIELD,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) diff --git a/rush/c160015021.lua b/rush/c160015021.lua index e776a69d63..99bf57b176 100644 --- a/rush/c160015021.lua +++ b/rush/c160015021.lua @@ -1,4 +1,5 @@ --サイバー・シャーク +--Cyber Shark (Rush) local s,id=GetID() function s.initial_effect(c) --summon without tribute diff --git a/rush/c160015023.lua b/rush/c160015023.lua index 39a56a0247..6b7e75399d 100644 --- a/rush/c160015023.lua +++ b/rush/c160015023.lua @@ -1,5 +1,5 @@ --地獄河童リバースプリンター ---Infernal Kappa River Sprinter +--Pandemonium Kappa River Sprinter --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160015033.lua b/rush/c160015033.lua index 4228e90879..e2306b54cc 100644 --- a/rush/c160015033.lua +++ b/rush/c160015033.lua @@ -44,7 +44,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local dg=g:Select(tp,1,1,nil) dg:AddMaximumCheck() Duel.HintSelection(dg,true) - local ct=Duel.Destroy(dg,REASON_EFFECT) + local ct=Duel.Destroy(dg,REASON_EFFECT) if ct>0 then local g2=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.spfilter),tp,0,LOCATION_GRAVE,nil,e,tp) if #g2>0 and Duel.IsExistingMatchingCard(s.attfilter,tp,LOCATION_GRAVE,0,1,nil,tp) and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then diff --git a/rush/c160015044.lua b/rush/c160015044.lua index 9ed9d74637..314fca5b64 100644 --- a/rush/c160015044.lua +++ b/rush/c160015044.lua @@ -30,5 +30,5 @@ function s.condition(e) return not Duel.IsExistingMatchingCard(s.filter,e:GetHandlerPlayer(),LOCATION_MZONE,0,1,nil) end function s.condition2(e) - return Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsType,TYPE_MAXIMUM),e:GetHandlerPlayer(),0,LOCATION_MZONE,1,nil) + return Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsType,TYPE_MAXIMUM),e:GetHandlerPlayer(),0,LOCATION_MZONE,1,nil) end \ No newline at end of file diff --git a/rush/c160015052.lua b/rush/c160015052.lua index 3b4679ce43..ca986cb135 100644 --- a/rush/c160015052.lua +++ b/rush/c160015052.lua @@ -1,5 +1,5 @@ -- ミラクルピック --- Miracle pick +--Miracle Pick local s,id=GetID() function s.initial_effect(c) -- Excavate 3, add 1 card to the hand, send the rest to Grave diff --git a/rush/c160015053.lua b/rush/c160015053.lua index cce827a2a7..c27309ba43 100644 --- a/rush/c160015053.lua +++ b/rush/c160015053.lua @@ -1,5 +1,5 @@ --透幻郷の錦綉 ---Autum Leaves of Blisstopia +--Autumn Leaves of Blisstopia --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160015060.lua b/rush/c160015060.lua index e6ab2a1914..2d3934d3a1 100644 --- a/rush/c160015060.lua +++ b/rush/c160015060.lua @@ -40,7 +40,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local sg=og:Filter(s.cfilter,nil) if #sg>0 and Duel.IsPlayerCanDraw(tp,#sg) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.BreakEffect() - Duel.Draw(tp,#sg,REASON_EFFECT) + Duel.Draw(tp,#sg,REASON_EFFECT) end end end \ No newline at end of file diff --git a/rush/c160015121.lua b/rush/c160015121.lua index 33b6afee7f..d8a5979949 100644 --- a/rush/c160015121.lua +++ b/rush/c160015121.lua @@ -1,3 +1,3 @@ --サイバー・シャーク ---Cyber Shark +--Cyber Shark (Rush) Duel.LoadCardScriptAlias(160015021) diff --git a/rush/c160016000.lua b/rush/c160016000.lua index f78f011a2d..d45f629b31 100644 --- a/rush/c160016000.lua +++ b/rush/c160016000.lua @@ -1,4 +1,5 @@ --ブラック・デーモンズ・ドラゴン +--Black Skull Dragon (Rush) local s,id=GetID() function s.initial_effect(c) --fusion material diff --git a/rush/c160016002.lua b/rush/c160016002.lua index 6ca0488d16..e526255279 100644 --- a/rush/c160016002.lua +++ b/rush/c160016002.lua @@ -24,7 +24,7 @@ function s.posfilter(c) return c:IsLevelAbove(7) and c:IsAttackPos() and c:IsCanTurnSet() and c:IsCanChangePositionRush() end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return Duel.IsExistingMatchingCard(s.posfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) + if chk==0 then return Duel.IsExistingMatchingCard(s.posfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) and Duel.GetFieldGroupCount(tp,0,LOCATION_DECK)>=3 and Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>=3 end Duel.SetOperationInfo(0,CATEGORY_POSITION,nil,1,0,0) end diff --git a/rush/c160016019.lua b/rush/c160016019.lua index 3f579d0c1a..f56e74d10c 100644 --- a/rush/c160016019.lua +++ b/rush/c160016019.lua @@ -1,5 +1,5 @@ --電獅子バンデ ---Electro-Lion Bande +--Vande the Electric Lion --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160016020.lua b/rush/c160016020.lua index 9f43a6b650..3960762f6f 100644 --- a/rush/c160016020.lua +++ b/rush/c160016020.lua @@ -1,5 +1,5 @@ --蒸気燕ジェムズ ---Steam Swallow Gem-zz +--James the Steam Swallow --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -35,7 +35,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp) local g2=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.setfilter),tp,LOCATION_GRAVE,0,nil) - if Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP_DEFENSE)>0 + if Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP_DEFENSE)>0 and #g2>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET) local sg=g2:Select(tp,1,1,nil) diff --git a/rush/c160016021.lua b/rush/c160016021.lua index 1acbe74324..e5785891db 100644 --- a/rush/c160016021.lua +++ b/rush/c160016021.lua @@ -47,7 +47,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) Duel.ShuffleDeck(tp) --Effect local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) - if Duel.Draw(p,d,REASON_EFFECT)>0 and Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>=5 + if Duel.Draw(p,d,REASON_EFFECT)>0 and Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>=5 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.ConfirmDecktop(tp,5) local g=Duel.GetDecktopGroup(tp,5) diff --git a/rush/c160016022.lua b/rush/c160016022.lua index d4f19c55c7..e514250595 100644 --- a/rush/c160016022.lua +++ b/rush/c160016022.lua @@ -1,5 +1,5 @@ --秘密捜査官ミスファイア ---Secret Investigator Misfire +--Agent Mishap --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -40,7 +40,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CANNOT_ATTACK) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end function s.ftarget(e,c) diff --git a/rush/c160016027.lua b/rush/c160016027.lua index a4db4a62d5..96c83fa754 100644 --- a/rush/c160016027.lua +++ b/rush/c160016027.lua @@ -1,5 +1,5 @@ --人造人間－サイコ・リターナー ---Jinzo - Returner +--Jinzo - Returner (Rush) --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160016028.lua b/rush/c160016028.lua index 656823e37d..7735d8ca93 100644 --- a/rush/c160016028.lua +++ b/rush/c160016028.lua @@ -1,5 +1,5 @@ --脅威の人造人間－サイコ・ショッカー ---Jinzo the Machine Menace +--Jinzo the Machine Menace (Rush) --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160016030.lua b/rush/c160016030.lua index fd833249ef..4e4b67d69b 100644 --- a/rush/c160016030.lua +++ b/rush/c160016030.lua @@ -27,7 +27,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetOperationInfo(0,CATEGORY_TODECK,nil,2,tp,LOCATION_GRAVE) end function s.spfilter(c,e,tp) - return (c:IsCode(CARD_GAIA_CHAMPION) or (c:IsRace(RACE_AQUA) and c:IsDefense(2000))) + return (c:IsCode(CARD_GAIA_CHAMPION) or (c:IsRace(RACE_AQUA) and c:IsDefense(2000))) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP) end function s.operation(e,tp,eg,ep,ev,re,r,rp) diff --git a/rush/c160016032.lua b/rush/c160016032.lua index cf3b52fb97..fe4cef1e57 100644 --- a/rush/c160016032.lua +++ b/rush/c160016032.lua @@ -1,5 +1,5 @@ --翻弄するエルフの剣士 ---Obnoxious Celtic Guard +--Obnoxious Celtic Guard (Rush) local s,id=GetID() function s.initial_effect(c) --indes diff --git a/rush/c160016033.lua b/rush/c160016033.lua index 22f8f7f88f..0c266118ee 100644 --- a/rush/c160016033.lua +++ b/rush/c160016033.lua @@ -1,5 +1,5 @@ --スナイプストーカー ---Snipe Hunter +--Snipe Hunter (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160016034.lua b/rush/c160016034.lua index 7610e3f50f..b8793915f0 100644 --- a/rush/c160016034.lua +++ b/rush/c160016034.lua @@ -1,5 +1,5 @@ --光鱗のトビウオ ---Golden Flying Fish +--Golden Flying Fish (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160016039.lua b/rush/c160016039.lua index 5624fb049b..43b70cdafd 100644 --- a/rush/c160016039.lua +++ b/rush/c160016039.lua @@ -1,5 +1,5 @@ --トランザム・プライム・フルアーマーノヴァ ---Transamu Praime Full Armor Nova +--Transam Praime Full Armor Nova local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() diff --git a/rush/c160016043.lua b/rush/c160016043.lua index 0fa84d28bd..652ff49c05 100644 --- a/rush/c160016043.lua +++ b/rush/c160016043.lua @@ -1,5 +1,5 @@ --華蝶風彩のプロフェシーフレイル ---Prophecy Flail of the Colors of the Wind, Butterflies, and Flowers +--Prophecy Flail of the Colors of the Wind, Butterflies and Flowers --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160016044.lua b/rush/c160016044.lua index dfb1f0c246..16c6bae9e9 100644 --- a/rush/c160016044.lua +++ b/rush/c160016044.lua @@ -1,5 +1,5 @@ --セレブローズ・インフルエンサーズ ---Celeb Rose Influncers +--Celeb Rose Influencers --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160016049.lua b/rush/c160016049.lua index 3e5825f38b..36c5e59593 100644 --- a/rush/c160016049.lua +++ b/rush/c160016049.lua @@ -1,5 +1,5 @@ --天使のサイコロ ---Graceful Dice +--Graceful Dice (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -21,7 +21,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local g=Duel.GetMatchingGroup(Card.IsFaceup,tp,LOCATION_MZONE,0,nil) if #g>0 then local d=Duel.TossDice(tp,1) - for sc in aux.Next(g) do + for sc in g:Iter() do local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) diff --git a/rush/c160016051.lua b/rush/c160016051.lua index c42bcbdcc1..1774727a24 100644 --- a/rush/c160016051.lua +++ b/rush/c160016051.lua @@ -31,7 +31,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_HAND|LOCATION_MZONE,0,1,2,e:GetHandler()) g=g:AddMaximumCheck() - if Duel.SendtoGrave(g,REASON_COST)<1 then return end + if Duel.SendtoGrave(g,REASON_COST)<1 then return end if Duel.Draw(tp,1,REASON_EFFECT)<1 then return end local g2=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.spfilter),tp,LOCATION_GRAVE,0,nil,e,tp) if #g2>0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then diff --git a/rush/c160016059.lua b/rush/c160016059.lua index 14b0067624..9a6927e1ec 100644 --- a/rush/c160016059.lua +++ b/rush/c160016059.lua @@ -26,8 +26,8 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) --Effect Duel.DiscardDeck(tp,1,REASON_EFFECT) local tc=Duel.GetOperatedGroup():GetFirst() - if tc:IsMonster() and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 - and tc:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEDOWN_DEFENSE) + if tc:IsMonster() and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 + and tc:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEDOWN_DEFENSE) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then local dg=Duel.GetMatchingGroup(Card.IsSpellTrap,tp,0,LOCATION_ONFIELD,nil) if Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEDOWN_DEFENSE)>0 and tc:IsLevel(2) and #dg>0 and Duel.SelectYesNo(tp,aux.Stringid(id,2)) then diff --git a/rush/c160016062.lua b/rush/c160016062.lua index 214387dcbb..4dde8e40c8 100644 --- a/rush/c160016062.lua +++ b/rush/c160016062.lua @@ -1,5 +1,5 @@ --悪魔のサイコロ ---Skull Dice +--Skull Dice (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -16,8 +16,7 @@ function s.initial_effect(c) end s.roll_dice=true function s.condition(e,tp,eg,ep,ev,re,r,rp) - local ac=Duel.GetAttacker() - return ac:IsControler(1-tp) + return Duel.GetAttacker():IsControler(1-tp) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,1,nil) end @@ -26,7 +25,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local g=Duel.GetMatchingGroup(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,nil) if #g>0 then local d=Duel.TossDice(tp,1)*100 - for sc in aux.Next(g) do + for sc in g:Iter() do local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) @@ -38,4 +37,4 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) sc:RegisterEffect(e2) end end -end +end \ No newline at end of file diff --git a/rush/c160016063.lua b/rush/c160016063.lua index dd18c98a8c..7fae8bc2df 100644 --- a/rush/c160016063.lua +++ b/rush/c160016063.lua @@ -30,7 +30,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) Duel.Damage(1-tp,d*100,REASON_EFFECT) local g=Duel.GetMatchingGroup(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,nil) if #g>0 then - for sc in aux.Next(g) do + for sc in g:Iter() do local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) diff --git a/rush/c160017009.lua b/rush/c160017009.lua index 9daaa0503f..ebcd34f613 100644 --- a/rush/c160017009.lua +++ b/rush/c160017009.lua @@ -1,5 +1,5 @@ --ケミスペット・インコ ---Chemispet Parakeet +--Chemipet Chirp --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -31,7 +31,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetPossibleOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_GRAVE) end function s.thfilter(c,lvl) - return c:IsLocation(LOCATION_GRAVE) and c:IsRace(RACE_PYRO|RACE_AQUA|RACE_THUNDER) and c:IsLevel(lvl) and c:IsAbleToHand() + return c:IsLocation(LOCATION_GRAVE) and c:IsRace(RACE_PYRO|RACE_AQUA|RACE_THUNDER) and c:IsLevel(lvl) and c:IsAbleToHand() end function s.operation(e,tp,eg,ep,ev,re,r,rp) --Requirement diff --git a/rush/c160017032.lua b/rush/c160017032.lua index ce6475301f..8cf96a3bf2 100644 --- a/rush/c160017032.lua +++ b/rush/c160017032.lua @@ -40,8 +40,8 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK) local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.filter),tp,0,LOCATION_GRAVE,ct2,ct2,nil) Duel.HintSelection(g) - if Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)>0 - and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) + if Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)>0 + and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,1,nil) diff --git a/rush/c160017033.lua b/rush/c160017033.lua index 894f59fc25..95e34d0ccd 100644 --- a/rush/c160017033.lua +++ b/rush/c160017033.lua @@ -1,5 +1,5 @@ --地帝グランマーグ ---Granmarg the Rock Monarch +--Granmarg the Rock Monarch (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160017038.lua b/rush/c160017038.lua index 2ba2c44eda..3430ba4531 100644 --- a/rush/c160017038.lua +++ b/rush/c160017038.lua @@ -22,7 +22,7 @@ function s.revfilter2(c) return c:IsMonster() and not c:IsAttribute(ATTRIBUTE_EARTH) and not c:IsPublic() end function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return Duel.IsExistingMatchingCard(s.revfilter,tp,LOCATION_HAND,0,1,nil) + if chk==0 then return Duel.IsExistingMatchingCard(s.revfilter,tp,LOCATION_HAND,0,1,nil) and Duel.IsExistingMatchingCard(s.revfilter2,tp,LOCATION_HAND,0,1,nil) end end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) @@ -42,7 +42,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(Card.IsAbleToDeck),tp,0,LOCATION_GRAVE,2,2,nil) Duel.HintSelection(g) if Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT)<2 then return end - if Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,LOCATION_MZONE,0,1,nil) + if Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,LOCATION_MZONE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATKDEF) local tc=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,LOCATION_MZONE,0,1,1,nil):GetFirst() diff --git a/rush/c160017039.lua b/rush/c160017039.lua index 09df25166a..dc522ab0fb 100644 --- a/rush/c160017039.lua +++ b/rush/c160017039.lua @@ -30,9 +30,9 @@ function s.cfilter(c) end function s.operation(e,tp,eg,ep,ev,re,r,rp) local p,val=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) - if Duel.Damage(p,val,REASON_EFFECT)>0 + if Duel.Damage(p,val,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_GRAVE,0,1,nil) - and Duel.IsExistingMatchingCard(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil) + and Duel.IsExistingMatchingCard(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATKDEF) local dg=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,1,1,nil) diff --git a/rush/c160017042.lua b/rush/c160017042.lua index fc80c7df71..1a578ff7fe 100644 --- a/rush/c160017042.lua +++ b/rush/c160017042.lua @@ -1,5 +1,5 @@ --七宝神－米大 ---Deity of Seven Treasures - Heitai +--Deity of Seven Treasures - Beidai --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -40,7 +40,7 @@ function s.atkfilter(c) end function s.operation(e,tp,eg,ep,ev,re,r,rp) if Duel.DiscardDeck(tp,2,REASON_EFFECT)==0 then return end - if Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.atkfilter),tp,0,LOCATION_MZONE,1,nil) + if Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.atkfilter),tp,0,LOCATION_MZONE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATKDEF) local g=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(s.atkfilter),tp,0,LOCATION_MZONE,1,1,nil) diff --git a/rush/c160017043.lua b/rush/c160017043.lua index 1cfc9e6bc1..1ef67db9be 100644 --- a/rush/c160017043.lua +++ b/rush/c160017043.lua @@ -8,17 +8,17 @@ function s.initial_effect(c) local e1=aux.AddNormalSummonProcedure(c,true,true,3,3,SUMMON_TYPE_TRIBUTE+1,aux.Stringid(id,0),aux.FilterBoolFunction(Card.IsType,TYPE_EFFECT)) -- local e1=Effect.CreateEffect(c) - e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) - e1:SetCode(EVENT_SUMMON_SUCCESS) - e1:SetOperation(s.operation) - c:RegisterEffect(e1) - --tribute check - local e2=Effect.CreateEffect(c) - e2:SetType(EFFECT_TYPE_SINGLE) - e2:SetCode(EFFECT_MATERIAL_CHECK) - e2:SetValue(s.valcheck) - e2:SetLabelObject(e1) - c:RegisterEffect(e2) + e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS) + e1:SetCode(EVENT_SUMMON_SUCCESS) + e1:SetOperation(s.operation) + c:RegisterEffect(e1) + --tribute check + local e2=Effect.CreateEffect(c) + e2:SetType(EFFECT_TYPE_SINGLE) + e2:SetCode(EFFECT_MATERIAL_CHECK) + e2:SetValue(s.valcheck) + e2:SetLabelObject(e1) + c:RegisterEffect(e2) end function s.operation(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() @@ -56,7 +56,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) catk=tc.MaximumAttack*2 end atk=atk+(catk>=0 and catk or 0) - else + else for tc in sg:Iter() do local catk=0 catk=tc:GetTextAttack() @@ -95,7 +95,7 @@ function s.valcheck(e,c) tg=sg:Filter(Card.HasFlagEffect,nil,FLAG_DOUBLE_TRIB_DARK+FLAG_DOUBLE_TRIB_FIEND+FLAG_DOUBLE_TRIB_0_ATK+FLAG_DOUBLE_TRIB_0_DEF+FLAG_DOUBLE_TRIB_EFFECT) end tg:KeepAlive() - local label_obj=e:GetLabelObject() --this is e0 + local label_obj=e:GetLabelObject() --this is e0 label_obj:SetLabelObject(tg) return end diff --git a/rush/c160017045.lua b/rush/c160017045.lua index 29a7d1f29a..7f58dbd225 100644 --- a/rush/c160017045.lua +++ b/rush/c160017045.lua @@ -54,7 +54,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetTargetRange(1,0) e1:SetCondition(s.accon) e1:SetValue(s.aclimit) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) Duel.RegisterFlagEffect(tp,id,RESET_PHASE+PHASE_END,0,2) end diff --git a/rush/c160017047.lua b/rush/c160017047.lua index 8f826d2cd3..9733c6ce42 100644 --- a/rush/c160017047.lua +++ b/rush/c160017047.lua @@ -26,6 +26,6 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local sg=Duel.GetMatchingGroup(Card.IsSpellTrap,tp,0,LOCATION_ONFIELD,nil) if g:FilterCount(Card.IsSpellTrap,nil)>0 and #sg>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Destroy(sg,REASON_EFFECT) - end + end Duel.SortDecktop(1-tp,1-tp,4) end \ No newline at end of file diff --git a/rush/c160017050.lua b/rush/c160017050.lua index d827d50e9d..74f1ecec8f 100644 --- a/rush/c160017050.lua +++ b/rush/c160017050.lua @@ -45,10 +45,10 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) if Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_GRAVE,0,1,nil,160210021) and #sg>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) local tg=sg:Select(tp,1,1,nil) - if #tg>0 then + if #tg>0 then tg=tg:AddMaximumCheck() Duel.HintSelection(tg) - Duel.Destroy(tg,REASON_EFFECT) + Duel.Destroy(tg,REASON_EFFECT) end end end \ No newline at end of file diff --git a/rush/c160017052.lua b/rush/c160017052.lua index c5ff626ed9..22a862998b 100644 --- a/rush/c160017052.lua +++ b/rush/c160017052.lua @@ -50,7 +50,7 @@ function s.operation(fustg,fusop) --Effect Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET) local sg=Duel.SelectMatchingCard(1-tp,s.filter,tp,0,LOCATION_GRAVE,1,1,nil,e,1-tp) - if #sg>0 and Duel.SpecialSummon(sg,0,1-tp,1-tp,false,false,POS_FACEDOWN_DEFENSE)>0 + if #sg>0 and Duel.SpecialSummon(sg,0,1-tp,1-tp,false,false,POS_FACEDOWN_DEFENSE)>0 and fustg(e,tp,eg,ep,ev,re,r,rp,0) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.BreakEffect() fusop(e,tp,eg,ep,ev,re,r,rp) diff --git a/rush/c160017054.lua b/rush/c160017054.lua index be1d477bb8..935f10123f 100644 --- a/rush/c160017054.lua +++ b/rush/c160017054.lua @@ -1,5 +1,5 @@ --ブルー・トゥース・リコネクト ---Blue Tooth Reconnect +--Blue-Fang Reconnect --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160017056.lua b/rush/c160017056.lua index 9032f8d009..bf50d38fb8 100644 --- a/rush/c160017056.lua +++ b/rush/c160017056.lua @@ -39,7 +39,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_OATH) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end function s.ftarget(e,c) diff --git a/rush/c160017063.lua b/rush/c160017063.lua index c7bb163a28..581aee08d1 100644 --- a/rush/c160017063.lua +++ b/rush/c160017063.lua @@ -1,5 +1,5 @@ --ＪＡＭ：Ｐキャッチ！ ---JAM:P Catch +--JAM:P Catch! --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -43,7 +43,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) --Effect local at=Duel.GetAttacker() local ct=Duel.GetFieldGroupCount(tp,LOCATION_HAND,0) - if at and at:IsAttackPos() and at:IsRelateToBattle() and Duel.ChangePosition(at,POS_FACEUP_DEFENSE)>0 + if at and at:IsAttackPos() and at:IsRelateToBattle() and Duel.ChangePosition(at,POS_FACEUP_DEFENSE)>0 and Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_GRAVE,0,1,nil) and ct<6 and Duel.IsPlayerCanDraw(tp,6-ct) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Draw(tp,6-ct,REASON_EFFECT) diff --git a/rush/c160017163.lua b/rush/c160017163.lua index 4366e8b88d..2fa60ff2af 100644 --- a/rush/c160017163.lua +++ b/rush/c160017163.lua @@ -1,3 +1,3 @@ --ＪＡＭ：Ｐキャッチ！ ---JAM:P Catch +--JAM:P Catch! Duel.LoadCardScriptAlias(160017063) diff --git a/rush/c160018000.lua b/rush/c160018000.lua index 4a4250e1b2..c4dbc7f7ac 100644 --- a/rush/c160018000.lua +++ b/rush/c160018000.lua @@ -1,5 +1,5 @@ --Ｅ・ＨＥＲＯ シャイニング・フレア・ウィングマン ---Elemental HERO Shining Flare Wingman +--Elemental HERO Shining Flare Wingman (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160018009.lua b/rush/c160018009.lua index 4bbb78d744..6e154bf984 100644 --- a/rush/c160018009.lua +++ b/rush/c160018009.lua @@ -1,5 +1,5 @@ --ＨＰアシスタント・ヒーヤ ---Hyper Assistant Hiya +--Icelyn the Hyper Assistant --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160018010.lua b/rush/c160018010.lua index da63f824c1..d11605ce00 100644 --- a/rush/c160018010.lua +++ b/rush/c160018010.lua @@ -37,8 +37,8 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local ct=Duel.GetMatchingGroupCount(s.filter,tp,LOCATION_MZONE,LOCATION_MZONE,nil) Duel.DiscardDeck(tp,ct,REASON_EFFECT) local g=Duel.GetOperatedGroup() - if g:FilterCount(Card.IsMonster,nil)>0 - and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_GRAVE,0,1,nil) + if g:FilterCount(Card.IsMonster,nil)>0 + and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_GRAVE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then local g2=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_GRAVE,0,1,2,nil) if #g2>0 then diff --git a/rush/c160018014.lua b/rush/c160018014.lua index ff10a4f75b..dd21e1d34c 100644 --- a/rush/c160018014.lua +++ b/rush/c160018014.lua @@ -1,5 +1,5 @@ --幻刃兵站デスク・タラスク ---Constructor Logistics Desk Taraque +--Constructor Logistics Desk Tarasque --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -50,7 +50,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_OATH) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end function s.ftarget(e,c) diff --git a/rush/c160018016.lua b/rush/c160018016.lua index 847188c72d..81fd615d45 100644 --- a/rush/c160018016.lua +++ b/rush/c160018016.lua @@ -37,7 +37,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_OATH) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end function s.ftarget(e,c) diff --git a/rush/c160018017.lua b/rush/c160018017.lua index 9ff93a37eb..55ba2de1be 100644 --- a/rush/c160018017.lua +++ b/rush/c160018017.lua @@ -1,5 +1,5 @@ --Ｎ・アクア・ドルフィン ---Neo-Spacian Aqua Dolphin +--Neo-Spacian Aqua Dolphin (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160018018.lua b/rush/c160018018.lua index b9db38626f..a0b3cb4265 100644 --- a/rush/c160018018.lua +++ b/rush/c160018018.lua @@ -1,4 +1,5 @@ --N・フレア・スカラベ +--Neo-Spacian Flare Scarab (Rush) local s,id=GetID() function s.initial_effect(c) --atk up @@ -12,5 +13,5 @@ function s.initial_effect(c) c:RegisterEffect(e1) end function s.val(e,c) - return Duel.GetMatchingGroupCount(Card.IsType,c:GetControler(),0,LOCATION_ONFIELD,nil,TYPE_SPELL|TYPE_TRAP)*400 + return Duel.GetMatchingGroupCount(Card.IsSpellTrap,c:GetControler(),0,LOCATION_ONFIELD,nil)*400 end diff --git a/rush/c160018019.lua b/rush/c160018019.lua index 276927d586..549f2c54c4 100644 --- a/rush/c160018019.lua +++ b/rush/c160018019.lua @@ -44,7 +44,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_OATH) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end function s.ftarget(e,c) diff --git a/rush/c160018020.lua b/rush/c160018020.lua index 996c1fa41d..f9c79b935c 100644 --- a/rush/c160018020.lua +++ b/rush/c160018020.lua @@ -1,5 +1,5 @@ --Ｒ・ＨＥＲＯ メナカイター ---Rising HERO Menachiter +--Rising HERO Manaccaniter --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160018023.lua b/rush/c160018023.lua index 10ff4b2102..d4ec31ceaa 100644 --- a/rush/c160018023.lua +++ b/rush/c160018023.lua @@ -30,8 +30,8 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetReset(RESETS_STANDARD_PHASE_END,2) e1:SetValue(1500) c:RegisterEffect(e1) - if tc:IsMonster() and tc:GetBaseAttack()==100 - and Duel.IsExistingMatchingCard(Card.IsCanChangePositionRush,tp,0,LOCATION_MZONE,1,nil) + if tc:IsMonster() and tc:GetBaseAttack()==100 + and Duel.IsExistingMatchingCard(Card.IsCanChangePositionRush,tp,0,LOCATION_MZONE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then local g=Duel.SelectMatchingCard(tp,Card.IsCanChangePositionRush,tp,0,LOCATION_MZONE,1,1,nil) Duel.HintSelection(g) diff --git a/rush/c160018026.lua b/rush/c160018026.lua index 704b7b17c9..b240f1ec78 100644 --- a/rush/c160018026.lua +++ b/rush/c160018026.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) end s.listed_names={160010034,160018022} function s.condition(e,tp,eg,ep,ev,re,r,rp) - return e:GetHandler():IsStatus(STATUS_SUMMON_TURN|STATUS_SPSUMMON_TURN) + return e:GetHandler():IsStatus(STATUS_SUMMON_TURN|STATUS_SPSUMMON_TURN) end function s.thfilter(c) return c:IsCode(160010034,160018022) and c:IsAbleToHand() diff --git a/rush/c160018030.lua b/rush/c160018030.lua index 1a8d4b203d..2f51b39d61 100644 --- a/rush/c160018030.lua +++ b/rush/c160018030.lua @@ -39,7 +39,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) Duel.HintSelection(g) if Duel.ChangePosition(g,POS_FACEUP_DEFENSE,POS_FACEDOWN_DEFENSE,POS_FACEUP_ATTACK,POS_FACEUP_ATTACK)>0 and Duel.GetMatchingGroupCount(Card.IsMonster,tp,LOCATION_GRAVE,0,nil)>=5 - and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) + and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,1,nil) diff --git a/rush/c160018036.lua b/rush/c160018036.lua index 778b116c37..4c1ddb2a8d 100644 --- a/rush/c160018036.lua +++ b/rush/c160018036.lua @@ -1,4 +1,5 @@ --ウミノタウルス +--Uminotaurus (Rush) local s,id=GetID() function s.initial_effect(c) --pierce diff --git a/rush/c160018042.lua b/rush/c160018042.lua index 48ccecf51d..259366ac69 100644 --- a/rush/c160018042.lua +++ b/rush/c160018042.lua @@ -21,13 +21,13 @@ function s.initial_effect(c) end s.listed_names={CARD_FUSION,160015051} --Psyquip Fusion function s.extrafil_repl_filter(c) - return c:IsMonster() and c:IsAbleToDeck() and c:IsRace(RACE_PSYCHIC) + return c:IsMonster() and c:IsAbleToDeck() and c:IsRace(RACE_PSYCHIC) end function s.extrafil_replacement(e,tp,mg) - return Duel.GetMatchingGroup(aux.NecroValleyFilter(s.extrafil_repl_filter),tp,LOCATION_GRAVE,0,nil) + return Duel.GetMatchingGroup(aux.NecroValleyFilter(s.extrafil_repl_filter),tp,LOCATION_GRAVE,0,nil) end function s.extramat(c,e,tp) - return c:IsControler(tp) and e:GetHandler():IsCode(CARD_FUSION,160015051) + return c:IsControler(tp) and e:GetHandler():IsCode(CARD_FUSION,160015051) end function s.operation(e,tc,tp,sg) local g=tc:GetMaterial() diff --git a/rush/c160018044.lua b/rush/c160018044.lua index e3638fdd51..4b1d3f184a 100644 --- a/rush/c160018044.lua +++ b/rush/c160018044.lua @@ -1,5 +1,5 @@ --サイバースパイス・クイーンターメリック ---Cyberspice Queen Turmeric +--Cybersepice Queen Turmeric --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160018048.lua b/rush/c160018048.lua index d662a9024d..3c2aa0846c 100644 --- a/rush/c160018048.lua +++ b/rush/c160018048.lua @@ -1,5 +1,5 @@ --エクスキューティー・リュミエル・Ｆ ---Excutie Lumiere Frontiere +--Executie Lumiere Frontiere --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160018051.lua b/rush/c160018051.lua index 6744ba2e33..08a6f1dd36 100644 --- a/rush/c160018051.lua +++ b/rush/c160018051.lua @@ -1,5 +1,5 @@ --双海潮流 ---Twin Ocean Tides +--Clashing Twin Tides --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160018052.lua b/rush/c160018052.lua index 11ca271157..99e00b234c 100644 --- a/rush/c160018052.lua +++ b/rush/c160018052.lua @@ -38,7 +38,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) elseif opt==1 then tdc=Duel.SendtoDeck(tg,nil,SEQ_DECKBOTTOM,REASON_EFFECT) end - if tdc>0 and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) + if tdc>0 and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,4)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,1,nil) diff --git a/rush/c160018053.lua b/rush/c160018053.lua index 3d3f7edf11..a22fcc3e8d 100644 --- a/rush/c160018053.lua +++ b/rush/c160018053.lua @@ -23,7 +23,7 @@ function s.initial_effect(c) c:RegisterEffect(e2) end function s.cfilter(c,tp) - return c:IsFaceup() and c:IsAbleToGraveAsCost() and c:IsRace(RACE_WYRM) and c:IsLevelAbove(7) + return c:IsFaceup() and c:IsAbleToGraveAsCost() and c:IsRace(RACE_WYRM) and c:IsLevelAbove(7) end function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil,tp) end diff --git a/rush/c160018056.lua b/rush/c160018056.lua index d38cea8bca..0b959a4015 100644 --- a/rush/c160018056.lua +++ b/rush/c160018056.lua @@ -39,7 +39,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp,chk) e1:SetProperty(EFFECT_FLAG_OATH) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end function s.rescon(sg,e,tp,mg) diff --git a/rush/c160018065.lua b/rush/c160018065.lua index 53b58961f8..f1f15eca43 100644 --- a/rush/c160018065.lua +++ b/rush/c160018065.lua @@ -36,6 +36,6 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local dg=g:Select(tp,1,1,nil) dg:AddMaximumCheck() Duel.HintSelection(dg) - Duel.Destroy(dg,REASON_EFFECT) + Duel.Destroy(dg,REASON_EFFECT) end end diff --git a/rush/c160018148.lua b/rush/c160018148.lua index 14857fd3b1..97a4f2256c 100644 --- a/rush/c160018148.lua +++ b/rush/c160018148.lua @@ -1,3 +1,3 @@ --エクスキューティー・リュミエル・Ｆ ---Excutie Lumiere Frontiere +--Executie Lumiere Frontiere Duel.LoadCardScriptAlias(160018048) diff --git a/rush/c160019000.lua b/rush/c160019000.lua index 0bdab1e35b..1d44ee8897 100644 --- a/rush/c160019000.lua +++ b/rush/c160019000.lua @@ -1,5 +1,5 @@ --お注射天使リリー ---Injection Fairy Lily +--Injection Fairy Lily (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -16,9 +16,9 @@ function s.initial_effect(c) c:RegisterEffect(e1) end function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then + if chk==0 then if Duel.IsPlayerAffectedByEffect(tp,160019053) then return Duel.CheckLPCost(tp,100) end - return Duel.CheckLPCost(tp,2000) + return Duel.CheckLPCost(tp,2000) end end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) @@ -32,7 +32,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) if Duel.IsPlayerAffectedByEffect(tp,160019053) and (not Duel.CheckLPCost(tp,2000) or Duel.SelectYesNo(tp,aux.Stringid(id,1))) then lpcost=100 end - Duel.PayLPCost(tp,lpcost) + Duel.PayLPCost(tp,lpcost) --Effect --Increase ATK by 3000 local e1=Effect.CreateEffect(c) diff --git a/rush/c160019003.lua b/rush/c160019003.lua index 562b5c93f0..4b6c5749c1 100644 --- a/rush/c160019003.lua +++ b/rush/c160019003.lua @@ -1,5 +1,5 @@ --ＨＰアシスタント・ビリー ---Hyper Assistant Biri +--Sparkle the Hyper Assistant --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160019005.lua b/rush/c160019005.lua index 0184d4c9c8..2966a991c9 100644 --- a/rush/c160019005.lua +++ b/rush/c160019005.lua @@ -32,7 +32,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local ct=Duel.GetOperatedGroup():GetFirst() if ct:IsMonster() and ct:IsLevel(7) and ct.roll_dice then local dam=Duel.Damage(1-tp,700,REASON_EFFECT) - if dam>0 and Duel.IsExistingMatchingCard(Card.IsNotMaximumModeSide,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) + if dam>0 and Duel.IsExistingMatchingCard(Card.IsNotMaximumModeSide,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then local g=Duel.GetMatchingGroup(Card.IsNotMaximumModeSide,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) diff --git a/rush/c160019012.lua b/rush/c160019012.lua index 699199032f..4d7819a9c9 100644 --- a/rush/c160019012.lua +++ b/rush/c160019012.lua @@ -1,5 +1,5 @@ --イエロー・ガジェット ---Yellow Gadget +--Yellow Gadget (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160019013.lua b/rush/c160019013.lua index 7589067e4a..fd5be1ad4d 100644 --- a/rush/c160019013.lua +++ b/rush/c160019013.lua @@ -1,5 +1,5 @@ --グリーン・ガジェット ---Green Gadget +--Green Gadget (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160019014.lua b/rush/c160019014.lua index 0a9024f9b7..4ddae03b8f 100644 --- a/rush/c160019014.lua +++ b/rush/c160019014.lua @@ -1,5 +1,5 @@ --グリーン・ガジェット ---Red Gadget +--Red Gadget (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160019021.lua b/rush/c160019021.lua index 8104ed9aec..d1fe784e41 100644 --- a/rush/c160019021.lua +++ b/rush/c160019021.lua @@ -1,5 +1,5 @@ --Ｎ・エア・ハミングバード ---Neo-Spacian Air Hummingbird +--Neo-Spacian Air Hummingbird (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160019022.lua b/rush/c160019022.lua index b8a38783a1..e6eb5a3324 100644 --- a/rush/c160019022.lua +++ b/rush/c160019022.lua @@ -36,7 +36,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) --Effect Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp) - if Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)>0 and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,LOCATION_MZONE,0,1,nil) + if Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)>0 and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,LOCATION_MZONE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATKDEF) local tc=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,LOCATION_MZONE,0,1,1,nil):GetFirst() diff --git a/rush/c160019029.lua b/rush/c160019029.lua index d4aa291be3..93cf8f0f66 100644 --- a/rush/c160019029.lua +++ b/rush/c160019029.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) c:RegisterEffect(e1) end function s.cfilter(c) - return (c:IsCode(id) or c:IsType(TYPE_MONSTER)) and c:IsAbleToDeckOrExtraAsCost() + return (c:IsCode(id) or c:IsMonster()) and c:IsAbleToDeckOrExtraAsCost() end function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) local cg=Duel.GetMatchingGroup(s.cfilter,tp,LOCATION_GRAVE,0,nil) diff --git a/rush/c160019033.lua b/rush/c160019033.lua index 87d5d8a558..0874acf280 100644 --- a/rush/c160019033.lua +++ b/rush/c160019033.lua @@ -1,5 +1,5 @@ --THE トリッキー ---The Tricky +--The Tricky (Rush) local s,id=GetID() function s.initial_effect(c) --special summon diff --git a/rush/c160019034.lua b/rush/c160019034.lua index 15608a50ef..635a9ab2a5 100644 --- a/rush/c160019034.lua +++ b/rush/c160019034.lua @@ -1,5 +1,5 @@ --月の女戦士 ---Penumbral Soldier Lady +--Penumbral Soldier Lady (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -13,5 +13,5 @@ function s.initial_effect(c) c:RegisterEffect(e1) end function s.condtion(e) - return Duel.IsBattlePhase() and Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsAttribute,ATTRIBUTE_LIGHT),e:GetHandlerPlayer(),0,LOCATION_MZONE,1,nil) + return Duel.IsBattlePhase() and Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsAttribute,ATTRIBUTE_LIGHT),e:GetHandlerPlayer(),0,LOCATION_MZONE,1,nil) end \ No newline at end of file diff --git a/rush/c160019036.lua b/rush/c160019036.lua index 0836e0a58c..bd43c11147 100644 --- a/rush/c160019036.lua +++ b/rush/c160019036.lua @@ -1,5 +1,5 @@ --トランザム・バスターライナック ---Transamu Buster Rainac +--Transam Buster Linac --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160019047.lua b/rush/c160019047.lua index 83b94d963c..049194b7a0 100644 --- a/rush/c160019047.lua +++ b/rush/c160019047.lua @@ -1,5 +1,5 @@ --Ｅ・ＨＥＲＯ セイラーマン ---Elemental HERO Mariner +--Elemental HERO Mariner (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160019048.lua b/rush/c160019048.lua index c81a8a0c39..830f713344 100644 --- a/rush/c160019048.lua +++ b/rush/c160019048.lua @@ -1,5 +1,5 @@ --トランザム・ネビュラ・フュージョン ---Transamu Nebula Fusion +--Transam Nebula Fusion --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160019053.lua b/rush/c160019053.lua index 3e21b92f50..307c1020f9 100644 --- a/rush/c160019053.lua +++ b/rush/c160019053.lua @@ -36,7 +36,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(id) e1:SetTargetRange(1,0) e1:SetValue(1) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end end \ No newline at end of file diff --git a/rush/c160019057.lua b/rush/c160019057.lua index 06954b5400..02d40e8104 100644 --- a/rush/c160019057.lua +++ b/rush/c160019057.lua @@ -55,8 +55,8 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) if #dg>0 then Duel.HintSelection(dg) dg=dg:AddMaximumCheck() - if Duel.Destroy(dg,REASON_EFFECT)>0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 - and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp) + if Duel.Destroy(dg,REASON_EFFECT)>0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 + and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_GRAVE,0,1,nil,e,tp) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) local sg=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp) diff --git a/rush/c160019058.lua b/rush/c160019058.lua index e396d5a386..ec1723c256 100644 --- a/rush/c160019058.lua +++ b/rush/c160019058.lua @@ -1,5 +1,5 @@ --時の機械－タイム・マシーン ---Time Machine +--Time Machine (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -23,19 +23,21 @@ function s.maxfilter(c,tc) return c:WasMaximumModeSide() and c:HasFlagEffect(FLAG_MAXIMUM_SIDE_RELATION+tc:GetCardID()) end function s.activate(e,tp,eg,ep,ev,re,r,rp) + --0x2: second main monster zone/left main monster zone in Rush + --0x4: middle main monster zone + --0x8: fourth main monster zone/right main monster zone in Rush local tc=eg:GetFirst() if tc:WasMaximumMode() then Duel.SpecialSummon(tc,0,tp,tc:GetPreviousControler(),false,false,tc:GetPreviousPosition(),0x4) - tc:RegisterFlagEffect(FLAG_MAXIMUM_CENTER,RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD,0,1) - + tc:RegisterFlagEffect(FLAG_MAXIMUM_CENTER,RESET_EVENT|RESETS_STANDARD&~RESET_TOFIELD,0,1) local maxg=Duel.GetMatchingGroup(s.maxfilter,tc:GetPreviousControler(),LOCATION_GRAVE,0,nil,tc) - for maxc in aux.Next(maxg) do + for maxc in maxg:Iter() do local zone=0x8 if maxc.MaximumSide=="Left" then zone=0x2 end - maxc:RegisterFlagEffect(FLAG_MAXIMUM_SIDE,RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD,0,1) + maxc:RegisterFlagEffect(FLAG_MAXIMUM_SIDE,RESET_EVENT|RESETS_STANDARD&~RESET_TOFIELD,0,1) Duel.MoveToField(maxc,tc:GetPreviousControler(),tc:GetPreviousControler(),LOCATION_MZONE,POS_FACEUP_ATTACK,true,zone) end else Duel.SpecialSummon(tc,0,tp,tc:GetPreviousControler(),false,false,tc:GetPreviousPosition()) end -end +end \ No newline at end of file diff --git a/rush/c160019059.lua b/rush/c160019059.lua index 8365f6ed0f..051c33fa70 100644 --- a/rush/c160019059.lua +++ b/rush/c160019059.lua @@ -1,5 +1,5 @@ --起動指令 ギア・フォース ---Boot-Up Order - Gear Force +--Boot-Up Order - Gear Force (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160019063.lua b/rush/c160019063.lua index b4bea1af47..ba80a34a96 100644 --- a/rush/c160019063.lua +++ b/rush/c160019063.lua @@ -1,5 +1,5 @@ --狡猾な落とし穴 ---Treacherous Trap Hole +--Treacherous Trap Hole (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160019064.lua b/rush/c160019064.lua index e6067da6a7..8dca383e40 100644 --- a/rush/c160019064.lua +++ b/rush/c160019064.lua @@ -1,5 +1,5 @@ --第六感 ---Sixth Sense +--Sixth Sense (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160019065.lua b/rush/c160019065.lua index 631bac4ca7..1980b0048d 100644 --- a/rush/c160019065.lua +++ b/rush/c160019065.lua @@ -1,5 +1,5 @@ --Ｅ・ＨＥＲＯ プリズマー ---Elemental HERO Prisma +--Elemental HERO Prisma (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160019066.lua b/rush/c160019066.lua index c48f37a1b5..a41e8f4e44 100644 --- a/rush/c160019066.lua +++ b/rush/c160019066.lua @@ -41,6 +41,6 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetRange(LOCATION_MZONE) e1:SetCode(EFFECT_EXTRA_ATTACK_MONSTER) e1:SetValue(1) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) c:RegisterEffect(e1) end diff --git a/rush/c160020017.lua b/rush/c160020017.lua index 577e400218..4a56124a01 100644 --- a/rush/c160020017.lua +++ b/rush/c160020017.lua @@ -1,5 +1,5 @@ --ギフトタリスト ～ＳＰ ＭＩＸ～ ---Giftarist - Speedy Mix +--Giftarist - Speedy MIX --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160020034.lua b/rush/c160020034.lua index c7793477ab..96a8157325 100644 --- a/rush/c160020034.lua +++ b/rush/c160020034.lua @@ -41,7 +41,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) if Duel.SendtoGrave(g,REASON_COST)<1 then return end --Effect local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) - if Duel.Draw(p,d,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) + if Duel.Draw(p,d,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) local g2=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,1,nil) diff --git a/rush/c160020048.lua b/rush/c160020048.lua index 3d177fbecc..935b2f750c 100644 --- a/rush/c160020048.lua +++ b/rush/c160020048.lua @@ -1,5 +1,5 @@ --デーモンの顕現 ---Archfiend's Manifestation +--Archfiend's Manifestation (Rush) --Scripted by AlphaKretin local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160020052.lua b/rush/c160020052.lua index c7bb96551d..271dad9c0f 100644 --- a/rush/c160020052.lua +++ b/rush/c160020052.lua @@ -38,7 +38,7 @@ function s.atklimit(e,sc,tp,sg,chk) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) e1:SetLabel(sc:GetFieldID()) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end end diff --git a/rush/c160020059.lua b/rush/c160020059.lua index a09ae33e56..df70262089 100644 --- a/rush/c160020059.lua +++ b/rush/c160020059.lua @@ -1,5 +1,5 @@ --テールスイング ---Tail Swipe +--Tail Swipe (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160020066.lua b/rush/c160020066.lua index 5859129dfa..d894482ab6 100644 --- a/rush/c160020066.lua +++ b/rush/c160020066.lua @@ -1,5 +1,5 @@ --ミラクル・コンタクト ---Miracle Contact +--Miracle Contact (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160201001.lua b/rush/c160201001.lua index 1e78269fc5..0e86d5b1aa 100644 --- a/rush/c160201001.lua +++ b/rush/c160201001.lua @@ -1,5 +1,5 @@ --魔将キメルーラ ---Fiendish Commander Kimeruler +--Kimeruler the Dark Raider local s,id=GetID() function s.initial_effect(c) @@ -43,7 +43,7 @@ function s.dirop(e,tp,eg,ep,ev,re,r,rp) e2:SetProperty(EFFECT_FLAG_OATH) e2:SetTargetRange(LOCATION_MZONE,0) e2:SetTarget(s.ftarget) - e2:SetReset(RESET_PHASE+PHASE_END) + e2:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e2,tp) end end diff --git a/rush/c160201004.lua b/rush/c160201004.lua index 98d5d2379d..5c304df374 100644 --- a/rush/c160201004.lua +++ b/rush/c160201004.lua @@ -1,5 +1,5 @@ --不許始末戦士 ---Forbidding Warrior +--Yurushima Warrior --Scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160201010.lua b/rush/c160201010.lua index 2073f55270..ed8534d047 100644 --- a/rush/c160201010.lua +++ b/rush/c160201010.lua @@ -1,5 +1,5 @@ --オジギプス ---Bandaged Bowing +--Bonded Bowing --Scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160201011.lua b/rush/c160201011.lua index e8a31cf02a..9dbaf43815 100644 --- a/rush/c160201011.lua +++ b/rush/c160201011.lua @@ -1,5 +1,5 @@ --『攻撃』封じ ---Block Attack (rush) +--Block Attack (Rush) local s,id=GetID() function s.initial_effect(c) --Position change diff --git a/rush/c160201012.lua b/rush/c160201012.lua index 5d10108a41..9c5b46beb0 100644 --- a/rush/c160201012.lua +++ b/rush/c160201012.lua @@ -1,5 +1,5 @@ --大貫通！！ ---Greater Piercing!! +--Powerful Pierce!! local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160201013.lua b/rush/c160201013.lua index 9ec437da5e..75686c30bf 100644 --- a/rush/c160201013.lua +++ b/rush/c160201013.lua @@ -1,5 +1,5 @@ --一同礼状 ---Scroll of Simultaneous Salutations +--Scroll of Salutation local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160201014.lua b/rush/c160201014.lua index be33080c5d..9ca5b8db5e 100644 --- a/rush/c160201014.lua +++ b/rush/c160201014.lua @@ -1,5 +1,5 @@ --仙人の神髄 ---Essence of the Hermit +--Hermit's Soul local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160201015.lua b/rush/c160201015.lua index 79a8967205..ff982f30bc 100644 --- a/rush/c160201015.lua +++ b/rush/c160201015.lua @@ -1,5 +1,5 @@ --ロイヤルデモンズ・インヴェイジョン ---Royal Demon’s Invasion +--Royal Rebel's Invasion local s,id=GetID() function s.initial_effect(c) --mat check diff --git a/rush/c160201017.lua b/rush/c160201017.lua index f5be18d062..9e83b398d7 100644 --- a/rush/c160201017.lua +++ b/rush/c160201017.lua @@ -1,5 +1,5 @@ --ロイヤルデモンズ・パンク ---Royal Demon's Punk +--Royal Rebel's Rocker local s,id=GetID() function s.initial_effect(c) --Add 1 Level 6 or higher Fiend from your GY to your hand @@ -36,7 +36,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CANNOT_DIRECT_ATTACK) e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) e1:SetTargetRange(LOCATION_MZONE,0) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end end diff --git a/rush/c160201018.lua b/rush/c160201018.lua index 56ac4f2012..6b70f0dbff 100644 --- a/rush/c160201018.lua +++ b/rush/c160201018.lua @@ -1,5 +1,5 @@ --ロイヤルデモンズ・シャウト ---Royal Demon's Shout +--Royal Rebel's Shout local s,id=GetID() function s.initial_effect(c) --Hand Destruction diff --git a/rush/c160201019.lua b/rush/c160201019.lua index 175a64d936..bc76ebec7d 100644 --- a/rush/c160201019.lua +++ b/rush/c160201019.lua @@ -1,5 +1,5 @@ --宮殿のガーゴイル ---Gargoyle of the Palace +--Palace Gargoyle local s,id=GetID() function s.initial_effect(c) --Increase Level by 1 diff --git a/rush/c160201024.lua b/rush/c160201024.lua index bb07dc6df0..051673bb7a 100644 --- a/rush/c160201024.lua +++ b/rush/c160201024.lua @@ -44,7 +44,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CANNOT_DIRECT_ATTACK) e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) e1:SetTargetRange(LOCATION_MZONE,0) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end end diff --git a/rush/c160201025.lua b/rush/c160201025.lua index 4f1da70f64..ea703dbb79 100644 --- a/rush/c160201025.lua +++ b/rush/c160201025.lua @@ -1,5 +1,5 @@ ---魔人の熱風 ---Simoom of the Genie +--魔人の熱風 +--Genie's Fire Breath local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160201026.lua b/rush/c160201026.lua index 686494a0a1..2230d71c01 100644 --- a/rush/c160201026.lua +++ b/rush/c160201026.lua @@ -1,5 +1,5 @@ --キングス・ディグニティ ---King's Dignity +--King's Majesty local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160201028.lua b/rush/c160201028.lua index c6a3b67e94..7cf1039851 100644 --- a/rush/c160201028.lua +++ b/rush/c160201028.lua @@ -1,5 +1,5 @@ --夢弦のフォルダーブリッツ ---Foldablitz of the Dream Strings +--Folder Blitz the Infinite Dream local s,id=GetID() function s.initial_effect(c) --Inflict 1500 damage diff --git a/rush/c160201029.lua b/rush/c160201029.lua index ae3d464f34..5c203e2e1f 100644 --- a/rush/c160201029.lua +++ b/rush/c160201029.lua @@ -1,5 +1,5 @@ --ベリーシスト ---Berryssist +--Berry Bassist local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160201030.lua b/rush/c160201030.lua index 94abf337e7..d6898cfd02 100644 --- a/rush/c160201030.lua +++ b/rush/c160201030.lua @@ -1,5 +1,5 @@ --エージェント・テレパス ---Agent Telepath +--Telepathic Agent local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160201036.lua b/rush/c160201036.lua index ad449b20cc..017a6fd230 100644 --- a/rush/c160201036.lua +++ b/rush/c160201036.lua @@ -1,5 +1,5 @@ --エレキック・アンプル ---Elechic Ampoule +--Elepsychic Amp Up --Scripted by pyrQ local s,id=GetID() diff --git a/rush/c160202001.lua b/rush/c160202001.lua index adf3f9fa8f..f019e9ce2e 100644 --- a/rush/c160202001.lua +++ b/rush/c160202001.lua @@ -1,3 +1,4 @@ +--超魔機神マグナム・オーバーロード［Ｌ］ --Supreme Machine Magnum Overlord [L] local s,id=GetID() function s.initial_effect(c) @@ -7,7 +8,7 @@ function s.initial_effect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetType(EFFECT_TYPE_IGNITION) e1:SetCountLimit(1) - e1:SetRange(LOCATION_MZONE) + e1:SetRange(LOCATION_MZONE) e1:SetCost(s.cost) e1:SetCondition(s.condition) e1:SetOperation(s.operation) @@ -20,7 +21,7 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) end function s.condition(e,tp,eg,ep,ev,re,r,rp) local lp=Duel.GetLP(1-tp)-Duel.GetLP(tp) - return lp>0 and e:GetHandler():IsMaximumModeCenter() + return lp>0 and e:GetHandler():IsMaximumModeCenter() end function s.operation(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() @@ -33,7 +34,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(lp) c:RegisterEffect(e1) end \ No newline at end of file diff --git a/rush/c160202003.lua b/rush/c160202003.lua index 7bfb595250..93fe11740d 100644 --- a/rush/c160202003.lua +++ b/rush/c160202003.lua @@ -1,3 +1,4 @@ +--超魔機神マグナム・オーバーロード［Ｒ］ --Supreme Machine Magnum Overlord [R] local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160202005.lua b/rush/c160202005.lua index 7b20c9d711..824dce9749 100644 --- a/rush/c160202005.lua +++ b/rush/c160202005.lua @@ -1,5 +1,5 @@ --クリボットリプル ---Kuribottriple +--Kuribotriple local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160202006.lua b/rush/c160202006.lua index 4ae4cd698e..de670f3149 100644 --- a/rush/c160202006.lua +++ b/rush/c160202006.lua @@ -1,4 +1,4 @@ ---サイレント・ラーニング +--サイレント・ラーニング --Silent Learning local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160202009.lua b/rush/c160202009.lua index bbc7511931..f9e73c36fe 100644 --- a/rush/c160202009.lua +++ b/rush/c160202009.lua @@ -1,5 +1,5 @@ --拡がるささやき ---Echoing Whispers +--Widening Whisper local s,id=GetID() function s.initial_effect(c) --Shuffle up to 5 monsters from any GY to the deck diff --git a/rush/c160202013.lua b/rush/c160202013.lua index 4bb549d5fe..a7abb8dddc 100644 --- a/rush/c160202013.lua +++ b/rush/c160202013.lua @@ -1,5 +1,5 @@ --ピーコック・ハイトロン ---Picock Hightron +--Peacock Picotron --Substitute ID local s,id=GetID() diff --git a/rush/c160202017.lua b/rush/c160202017.lua index a1f40e5fb7..d6c65a2f09 100644 --- a/rush/c160202017.lua +++ b/rush/c160202017.lua @@ -1,4 +1,4 @@ ---ヨクトロン +--ヨクトロン --Yoctron local s,id=GetID() diff --git a/rush/c160202021.lua b/rush/c160202021.lua index 37a184e0ae..f8278a509c 100644 --- a/rush/c160202021.lua +++ b/rush/c160202021.lua @@ -1,5 +1,5 @@ --- クリーンベレー・モップ大佐 --- Clean Beret – Mop Colonel +-- クリーンベレー・モップ大佐 +--Clean Beret - Colonel Mop local s,id=GetID() function s.initial_effect(c) -- atk change diff --git a/rush/c160202022.lua b/rush/c160202022.lua index a5320ce400..981bddaba9 100644 --- a/rush/c160202022.lua +++ b/rush/c160202022.lua @@ -1,5 +1,5 @@ ---洗浄のサンタクロス ---Washing Santa Cloth +--洗浄のサンタクロス +--Scrubbing Santa Cloth local s,id=GetID() function s.initial_effect(c) --Draw and recover diff --git a/rush/c160202023.lua b/rush/c160202023.lua index 75a0ced3c4..dce6a7ae93 100644 --- a/rush/c160202023.lua +++ b/rush/c160202023.lua @@ -1,5 +1,5 @@ ---洗銃士ウォッシューター ---Washing Musketeer Washooter +--洗銃士ウォッシューター +--Washsprayer the Cleansketeer local s,id=GetID() function s.initial_effect(c) --Send to GY and destroy diff --git a/rush/c160202024.lua b/rush/c160202024.lua index 664ac576dd..e3c102b75f 100644 --- a/rush/c160202024.lua +++ b/rush/c160202024.lua @@ -1,4 +1,4 @@ ---白激泡－ブリーチ・モーター +--白激泡－ブリーチ・モーター --Bleach Mortar local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160202025.lua b/rush/c160202025.lua index 33b5664d3c..c7e7258522 100644 --- a/rush/c160202025.lua +++ b/rush/c160202025.lua @@ -1,5 +1,5 @@ --- 妖瞳の二又猫 --- Odd-Eyes Twin-Tail Cat +-- 妖瞳の二又猫 +--Odd-Eyes Twin Tail Cat local s,id=GetID() function s.initial_effect(c) --Send to GY and destroy diff --git a/rush/c160202028.lua b/rush/c160202028.lua index f68d4502ac..97ff951479 100644 --- a/rush/c160202028.lua +++ b/rush/c160202028.lua @@ -1,5 +1,5 @@ --猫の目 ---Cat's Eyes +--Cat's Eye local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160202033.lua b/rush/c160202033.lua index 4c2d63ee9d..2004c1ce84 100644 --- a/rush/c160202033.lua +++ b/rush/c160202033.lua @@ -1,5 +1,5 @@ -- サンダービート・ギフト --- Thunderbeat Gift +--Thunderbeetle Gift local s,id=GetID() function s.initial_effect(c) local e1=Effect.CreateEffect(c) @@ -33,6 +33,6 @@ function s.damop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CANNOT_ATTACK_ANNOUNCE) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH) e1:SetTargetRange(1,0) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end \ No newline at end of file diff --git a/rush/c160202034.lua b/rush/c160202034.lua index 0b0916a059..554458f447 100644 --- a/rush/c160202034.lua +++ b/rush/c160202034.lua @@ -1,5 +1,5 @@ --嵐を呼ぶサンダービート ---Storm-Calling Thunderbeat +--Thunderbeetle Storm local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160202035.lua b/rush/c160202035.lua index b8a952103c..2c5acf154e 100644 --- a/rush/c160202035.lua +++ b/rush/c160202035.lua @@ -1,5 +1,5 @@ --サンダービート・ゲイン ---Thunderbeat Gain +--Thunderbeetle Boost local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160202037.lua b/rush/c160202037.lua index 9c4fbe3a20..7ddf4121bd 100644 --- a/rush/c160202037.lua +++ b/rush/c160202037.lua @@ -1,5 +1,5 @@ --イスの冥王ダユー ---Dayu the Dark King of Chairs +--Dahut, Dark Ruler of the Chair local s,id=GetID() function s.initial_effect(c) --ATK increase diff --git a/rush/c160202041.lua b/rush/c160202041.lua index 9a2f504177..f6ce8f802b 100644 --- a/rush/c160202041.lua +++ b/rush/c160202041.lua @@ -1,5 +1,5 @@ --コラプス・チェア ---Collapse Chair +--Collapsing Chairs --Substitute ID local s,id=GetID() diff --git a/rush/c160202042.lua b/rush/c160202042.lua index 1654ddb28f..c921d56472 100644 --- a/rush/c160202042.lua +++ b/rush/c160202042.lua @@ -1,5 +1,5 @@ --コズミックストリング・ヌードルイダス ---Cosmic String Noodle-Druidess +--Cosmic String Noodryad local s,id=GetID() function s.initial_effect(c) --Destroy all level 7 or lower monsters on the field diff --git a/rush/c160202043.lua b/rush/c160202043.lua index 549418598f..cc1680f3f3 100644 --- a/rush/c160202043.lua +++ b/rush/c160202043.lua @@ -1,5 +1,5 @@ --ギャラクシー・ナルトローラ ---Galaxy Narutorolla +--Galaxy Topping Troll local s,id=GetID() function s.initial_effect(c) @@ -31,7 +31,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(600) c:RegisterEffect(e1) end diff --git a/rush/c160202047.lua b/rush/c160202047.lua index d24221500b..9c382130a6 100644 --- a/rush/c160202047.lua +++ b/rush/c160202047.lua @@ -1,5 +1,5 @@ --チャーシューティング・スター ---Charshooting Star +--Chashooting Star local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160202049.lua b/rush/c160202049.lua index d93cb6d940..fa9a52954f 100644 --- a/rush/c160202049.lua +++ b/rush/c160202049.lua @@ -18,7 +18,7 @@ function s.costfilter(c) return c:IsRace(RACE_CYBERSE) and c:IsFaceup() and c:IsAbleToGraveAsCost() end function s.destg(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return Duel.IsExistingMatchingCard(s.costfilter,tp,LOCATION_MZONE,0,1,nil) + if chk==0 then return Duel.IsExistingMatchingCard(s.costfilter,tp,LOCATION_MZONE,0,1,nil) and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,1,nil) end end function s.desop(e,tp,eg,ep,ev,re,r,rp) diff --git a/rush/c160202050.lua b/rush/c160202050.lua index 32e40f9037..da16b1b217 100644 --- a/rush/c160202050.lua +++ b/rush/c160202050.lua @@ -1,5 +1,5 @@ --天の加護 ---Heavenly Protection +--Heavenly Gift --Substitute ID local s,id=GetID() diff --git a/rush/c160203001.lua b/rush/c160203001.lua index c5df92b656..c12474a4af 100644 --- a/rush/c160203001.lua +++ b/rush/c160203001.lua @@ -1,5 +1,5 @@ --超魔旗艦マグナム・オーバーロード［Ｌ］ ---Super Magiflag Ship Magnum Over Road [L] +--Supreme Skystream Magnum Overlord [L] local s,id=GetID() function s.initial_effect(c) local e1=Effect.CreateEffect(c) diff --git a/rush/c160203002.lua b/rush/c160203002.lua index 81e519dbeb..67d50129a7 100644 --- a/rush/c160203002.lua +++ b/rush/c160203002.lua @@ -1,5 +1,5 @@ -- 超魔旗艦マグナム・オーバーロード --- Supreme Flagship Magnum Overlord +--Supreme Skystream Magnum Overlord local s,id=GetID() function s.initial_effect(c) Maximum.AddProcedure(c,nil,s.filter1,s.filter2) diff --git a/rush/c160203004.lua b/rush/c160203004.lua index 4e5f798d8b..af4c83c90f 100644 --- a/rush/c160203004.lua +++ b/rush/c160203004.lua @@ -1,5 +1,5 @@ --- 緊急帰還 --- Emergency Reentry +-- 緊急帰還 +--Emergency Return local s,id=GetID() function s.initial_effect(c) --Negate opponent monster's attack diff --git a/rush/c160203005.lua b/rush/c160203005.lua index 34f4531b9f..07b5e82911 100644 --- a/rush/c160203005.lua +++ b/rush/c160203005.lua @@ -1,5 +1,5 @@ ---大恐竜駕ダイナーミクス［R］ ---Great Imperial Dinocarriage Dynarmix [R] +--大恐竜駕ダイナ－ミクス［Ｌ +--Dynamic Dino Dynamix [L] local s,id=GetID() function s.initial_effect(c) --atkup diff --git a/rush/c160203006.lua b/rush/c160203006.lua index 59450d5641..2a6d24019e 100644 --- a/rush/c160203006.lua +++ b/rush/c160203006.lua @@ -1,5 +1,5 @@ --大恐竜駕ダイナーミクス ---Great Imperial Dinocarriage Dynarmix +--Dynamic Dino Dynamix local s,id=GetID() function s.initial_effect(c) Maximum.AddProcedure(c,nil,s.filter1,s.filter2) diff --git a/rush/c160203007.lua b/rush/c160203007.lua index f0a510996e..43fdb7b226 100644 --- a/rush/c160203007.lua +++ b/rush/c160203007.lua @@ -1,5 +1,5 @@ --大恐竜駕ダイナーミクス［R］ ---Great Imperial Dinocarriage Dynarmix [R] +--Dynamic Dino Dynamix [R] local s,id=GetID() function s.initial_effect(c) --Cannot be destroyed diff --git a/rush/c160203008.lua b/rush/c160203008.lua index afe1f5ca34..450c0e58b6 100644 --- a/rush/c160203008.lua +++ b/rush/c160203008.lua @@ -1,5 +1,5 @@ --- 大くしゃみのゼニゲバザウルス --- Zenigebazauls +-- 大くしゃみのゼニゲバザウルス +--Sneezing Greedizauls local s,id=GetID() function s.initial_effect(c) --Draw diff --git a/rush/c160203009.lua b/rush/c160203009.lua index e27320f21a..c55e1e46a8 100644 --- a/rush/c160203009.lua +++ b/rush/c160203009.lua @@ -1,4 +1,4 @@ --- メック・テリジノラプトル +-- メック・テリジノラプトル -- Mech Therizinoraptor local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160203010.lua b/rush/c160203010.lua index 16911b0c5d..9344adf87a 100644 --- a/rush/c160203010.lua +++ b/rush/c160203010.lua @@ -1,5 +1,5 @@ --- ナリキング・レックス --- Upstart King Rex +-- ナリキング・レックス +--Ritzy King Rex local s,id=GetID() function s.initial_effect(c) --Draw diff --git a/rush/c160203011.lua b/rush/c160203011.lua index 19b9341712..450536892e 100644 --- a/rush/c160203011.lua +++ b/rush/c160203011.lua @@ -1,5 +1,5 @@ -- 抑竜ステルンプテラ --- Terrorsaur Sternptera +--Supressaurus Sternptera local s,id=GetID() function s.initial_effect(c) --Send the top card of your Deck to the GY diff --git a/rush/c160203016.lua b/rush/c160203016.lua index f9ff2ac9d6..d32ac90f13 100644 --- a/rush/c160203016.lua +++ b/rush/c160203016.lua @@ -16,7 +16,7 @@ function s.costfilter(c) return c:IsRace(RACE_DINOSAUR) and c:GetOriginalLevel()>0 and c:IsFaceup() and c:IsAbleToGraveAsCost() and c:IsNotMaximumModeSide() end function s.condition(e,tp,eg,ep,ev,re,r,rp) - return Duel.IsExistingMatchingCard(s.costfilter,tp,LOCATION_MZONE,0,1,nil) + return Duel.IsExistingMatchingCard(s.costfilter,tp,LOCATION_MZONE,0,1,nil) end function s.filter(c,e,tp) return c:IsRace(RACE_DINOSAUR) and c:IsLevelAbove(5) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) diff --git a/rush/c160203020.lua b/rush/c160203020.lua index 19b5e58228..7b6738c239 100644 --- a/rush/c160203020.lua +++ b/rush/c160203020.lua @@ -1,4 +1,4 @@ --- ダイノミック・プレッシャー +-- ダイノミック・プレッシャー -- Dinomic Pressure local s,id=GetID() diff --git a/rush/c160203021.lua b/rush/c160203021.lua index 57cc31c113..e97fb16818 100644 --- a/rush/c160203021.lua +++ b/rush/c160203021.lua @@ -1,5 +1,5 @@ -- シードクロトロン・ブラッセルン --- Seedclotron Brusseln +--Seedchrotron Brusselun local s,id=GetID() function s.initial_effect(c) --ATK increase diff --git a/rush/c160203024.lua b/rush/c160203024.lua index b3462d598e..5f13d083e2 100644 --- a/rush/c160203024.lua +++ b/rush/c160203024.lua @@ -1,4 +1,4 @@ --- イスの鏡王ダユー・エイビス +-- イスの鏡王ダユー・エイビス -- Dahut Abyss, Dark Mirror Ruler of the Chair local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160203025.lua b/rush/c160203025.lua index 0d73204732..460637e3d6 100644 --- a/rush/c160203025.lua +++ b/rush/c160203025.lua @@ -1,5 +1,5 @@ -- ドウェルチェア・コリキエル --- Dwell Chair Massage +--Scarechair Relaxer local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160203026.lua b/rush/c160203026.lua index cec36e5e29..94f7ddd8d5 100644 --- a/rush/c160203026.lua +++ b/rush/c160203026.lua @@ -1,5 +1,5 @@ -- ドウェルチェア・スケイル --- Dwell Chair Scale +--Scarechair Scale local s,id=GetID() function s.initial_effect(c) --Activate @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetTarget(s.target) e1:SetOperation(s.operation) c:RegisterEffect(e1) -end +end function s.condition(e,tp) return not Duel.IsExistingMatchingCard(Card.IsMonster,tp,LOCATION_ONFIELD,0,1,e:GetHandler()) end diff --git a/rush/c160203027.lua b/rush/c160203027.lua index 67a4a60c4e..dbf11892f4 100644 --- a/rush/c160203027.lua +++ b/rush/c160203027.lua @@ -1,5 +1,5 @@ --- ダークネス・リチェアル --- Darkness Ri-chair-ual +-- ダークネス・リチェアル +--Darkness Ri-chair-al local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160203028.lua b/rush/c160203028.lua index 7115e6b854..ad83a6d5c5 100644 --- a/rush/c160203028.lua +++ b/rush/c160203028.lua @@ -1,5 +1,5 @@ --- ジョイント・チェア --- Joint Chair +-- ジョイント・チェア +--Joining Chairs local s,id=GetID() function s.initial_effect(c) @@ -47,7 +47,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ge1:SetTarget(s.eftg) ge1:SetCondition(s.con) ge1:SetLabelObject(ge0) - ge1:SetReset(RESET_PHASE+PHASE_END) + ge1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(ge1,tp) --cannot attack directly with other cards local ge2=Effect.CreateEffect(e:GetHandler()) @@ -56,7 +56,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) ge2:SetProperty(EFFECT_FLAG_OATH+EFFECT_FLAG_IGNORE_IMMUNE) ge2:SetTargetRange(0,LOCATION_MZONE) ge2:SetTarget(s.eftg) - ge2:SetReset(RESET_PHASE+PHASE_END) + ge2:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(ge2,tp) end end diff --git a/rush/c160203030.lua b/rush/c160203030.lua index 9b309edb6c..aaeba12fe1 100644 --- a/rush/c160203030.lua +++ b/rush/c160203030.lua @@ -1,5 +1,5 @@ --透幻郷の銀嶺 ---The Snow-Capped Summit of Spectral Shangri-La +--Silvermountain of Blisstopia local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160203033.lua b/rush/c160203033.lua index ebc86b0545..3831f1b176 100644 --- a/rush/c160203033.lua +++ b/rush/c160203033.lua @@ -1,5 +1,5 @@ --- 幻刃復帰 --- Mythic Sword Return +-- 幻刃復帰 +--Constructor Resurrection local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160203035.lua b/rush/c160203035.lua index 07cf4c2997..effdfa462d 100644 --- a/rush/c160203035.lua +++ b/rush/c160203035.lua @@ -1,5 +1,5 @@ --弧楽姫ホルン・ワン・ユエ ---Horn Wan Yue the Crescent Music Maiden +--Horn Knives the Music Princess local s,id=GetID() function s.initial_effect(c) --ATK increase diff --git a/rush/c160203036.lua b/rush/c160203036.lua index d38b646277..134cf4a441 100644 --- a/rush/c160203036.lua +++ b/rush/c160203036.lua @@ -1,4 +1,4 @@ ---一気貫通 +--一気貫通 --Straight Pierce local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160203037.lua b/rush/c160203037.lua index 0cf170aef4..2fcfd405d6 100644 --- a/rush/c160203037.lua +++ b/rush/c160203037.lua @@ -1,5 +1,5 @@ ---楽姫の倍急風 --- Music Maiden Twin Squall +--楽姫の倍急風 +--Music Princess's Whirling Wind local s,id=GetID() function s.initial_effect(c) --Position change diff --git a/rush/c160203038.lua b/rush/c160203038.lua index d40b939931..bc205b2741 100644 --- a/rush/c160203038.lua +++ b/rush/c160203038.lua @@ -1,4 +1,4 @@ ---楽姫奥義－三連虎 +--楽姫奥義－三連虎 --Music Princess Art - Triplet local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160203039.lua b/rush/c160203039.lua index 264755dd14..0983d5b00e 100644 --- a/rush/c160203039.lua +++ b/rush/c160203039.lua @@ -1,5 +1,5 @@ --極上寿司天使アガリブエル ---Agariel, the Finest Sushi Angel +--Agariel, the Finest Sushi Fairy --Substitute ID local s,id=GetID() diff --git a/rush/c160203040.lua b/rush/c160203040.lua index ab1d205850..b8af26c6cd 100644 --- a/rush/c160203040.lua +++ b/rush/c160203040.lua @@ -38,7 +38,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_OATH) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end function s.ftarget(e,c) diff --git a/rush/c160203041.lua b/rush/c160203041.lua index 47573873df..7722b8fc5b 100644 --- a/rush/c160203041.lua +++ b/rush/c160203041.lua @@ -1,5 +1,5 @@ -- 寿司天使タイガーロール --- Tiger Roll the Sushi Angel +--Tiger Roll the Sushi Fairy local s,id=GetID() function s.initial_effect(c) --Add to hand @@ -32,7 +32,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e1:SetTargetRange(1,0) e1:SetTarget(s.sumlimit) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) local e2=e1:Clone() e2:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON) diff --git a/rush/c160203046.lua b/rush/c160203046.lua index 63c45c98d9..ba46ec9885 100644 --- a/rush/c160203046.lua +++ b/rush/c160203046.lua @@ -1,5 +1,5 @@ -- ローリング・ネバーダイ --- Rolling Never Die +--Rolled Sticky Save local s,id=GetID() function s.initial_effect(c) @@ -14,7 +14,7 @@ function s.initial_effect(c) c:RegisterEffect(e1) end function s.cfilter(c) - return c:IsFaceup() and c:IsRace(RACE_FAIRY) and c:IsPosition(POS_FACEUP_ATTACK) + return c:IsFaceup() and c:IsRace(RACE_FAIRY) and c:IsPosition(POS_FACEUP_ATTACK) end function s.condition(e,tp,eg,ep,ev,re,r,rp) return Duel.GetAttacker():IsControler(1-tp) and Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil) diff --git a/rush/c160203047.lua b/rush/c160203047.lua index 479e257989..728c74ef9b 100644 --- a/rush/c160203047.lua +++ b/rush/c160203047.lua @@ -1,5 +1,5 @@ --ローリング・ホットアロー ---Rolling Hot Arrow +--Rolled Hot Arrow local s,id=GetID() function s.initial_effect(c) --If opponent normal summons, special summon 1 insect 100 ATK or less from hand or grave diff --git a/rush/c160203048.lua b/rush/c160203048.lua index 597790c326..a53784fbd0 100644 --- a/rush/c160203048.lua +++ b/rush/c160203048.lua @@ -1,4 +1,4 @@ ---成銀ゴブリン +--成銀ゴブリン --Startup Goblin local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160203050.lua b/rush/c160203050.lua index fcd31fdc31..2bedc31f98 100644 --- a/rush/c160203050.lua +++ b/rush/c160203050.lua @@ -28,6 +28,6 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) Duel.HintSelection(g) g=g:AddMaximumCheck() if #g>0 then - Duel.SendtoHand(g,nil,REASON_EFFECT) + Duel.SendtoHand(g,nil,REASON_EFFECT) end end \ No newline at end of file diff --git a/rush/c160204001.lua b/rush/c160204001.lua index 3e1cc55eb6..046d72f265 100644 --- a/rush/c160204001.lua +++ b/rush/c160204001.lua @@ -1,4 +1,4 @@ ---メタリオン・アシュラスター +--メタリオン・アシュラスター --Metarion Ashurastar local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160204002.lua b/rush/c160204002.lua index 4969bbef26..389110125a 100644 --- a/rush/c160204002.lua +++ b/rush/c160204002.lua @@ -1,5 +1,5 @@ --メタリオン・ヴリトラスター ---Metallion Vritrastar +--Metarion Vritrastar local s,id=GetID() function s.initial_effect(c) --Fusion Summon diff --git a/rush/c160204003.lua b/rush/c160204003.lua index ea64f5bbc2..b3ba84fe25 100644 --- a/rush/c160204003.lua +++ b/rush/c160204003.lua @@ -1,5 +1,5 @@ ---メタリオン・エーラクレスター ---Metallion Eraclestar +--メタリオン・エーラクレスター +--Metarion Eraclestar local s,id=GetID() function s.initial_effect(c) --fusion material diff --git a/rush/c160204005.lua b/rush/c160204005.lua index be54e1eeac..cadcd8658f 100644 --- a/rush/c160204005.lua +++ b/rush/c160204005.lua @@ -1,4 +1,4 @@ ---ファイア・ジェスター +--ファイア・ジェスター --Fire Jester local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160204012.lua b/rush/c160204012.lua index 78deee678d..2003612526 100644 --- a/rush/c160204012.lua +++ b/rush/c160204012.lua @@ -1,5 +1,5 @@ --虚鋼演機塔 ---Imaginary Ark Tower +--Imaginary Arc Tower local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160204013.lua b/rush/c160204013.lua index 8f22c7372c..279d8e3aac 100644 --- a/rush/c160204013.lua +++ b/rush/c160204013.lua @@ -1,5 +1,5 @@ -- 虚鋼演機乱流 --- Imaginary Ark Turbulence +--Imaginary Arc Turbulence -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) @@ -53,7 +53,7 @@ function s.posop(e,tp,eg,ep,ev,re,r,rp) local dg=Duel.SelectMatchingCard(tp,s.desfilter,tp,0,LOCATION_MZONE,1,1,nil,tp) if #dg>0 then Duel.BreakEffect() - Duel.Destroy(dg,REASON_EFFECT) + Duel.Destroy(dg,REASON_EFFECT) end end end \ No newline at end of file diff --git a/rush/c160204014.lua b/rush/c160204014.lua index de35eb7d66..62c8ed13bd 100644 --- a/rush/c160204014.lua +++ b/rush/c160204014.lua @@ -1,5 +1,5 @@ -- 虚鋼演機再動 --- Imaginary Ark Turnback +--Imaginary Arc Turnback local s,id=GetID() function s.initial_effect(c) --summon a light with 500 def or a cyborg diff --git a/rush/c160204015.lua b/rush/c160204015.lua index 67f2efda9b..e5c1c46dff 100644 --- a/rush/c160204015.lua +++ b/rush/c160204015.lua @@ -1,5 +1,5 @@ --魔導騎士－セブンス・パラディン ---Sevens Paladin the Magical Knight +--Sevens Paladin local s,id=GetID() function s.initial_effect(c) --fusion material @@ -45,7 +45,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(att*400) c:RegisterEffect(e1) end diff --git a/rush/c160204017.lua b/rush/c160204017.lua index 9b83c34f06..d552a0651e 100644 --- a/rush/c160204017.lua +++ b/rush/c160204017.lua @@ -1,5 +1,5 @@ -- はぐれ集い魔 --- Stray Familia +--Straynge Cats -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160204018.lua b/rush/c160204018.lua index ea6f5e2f33..b0d5eac9d8 100644 --- a/rush/c160204018.lua +++ b/rush/c160204018.lua @@ -1,5 +1,5 @@ -- クリボットレーロ --- Kuribottorero +--Kuribotorero -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160204020.lua b/rush/c160204020.lua index bf064ba222..fde710430b 100644 --- a/rush/c160204020.lua +++ b/rush/c160204020.lua @@ -1,5 +1,5 @@ -- Ｍｒ．アルケ --- Mr. Alche +--Mr. Alchemy local s,id=GetID() function s.initial_effect(c) --Add card to hand diff --git a/rush/c160204022.lua b/rush/c160204022.lua index 56b04d0936..1302eb28ab 100644 --- a/rush/c160204022.lua +++ b/rush/c160204022.lua @@ -1,5 +1,5 @@ --超撃龍ドラギアスターＦ ---Superstrike Dragon Dragiastar F +--Hyperstrike Dragon Dragiastar F local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() diff --git a/rush/c160204023.lua b/rush/c160204023.lua index e04eba8feb..ceb451b18f 100644 --- a/rush/c160204023.lua +++ b/rush/c160204023.lua @@ -1,5 +1,5 @@ --月輪龍アンブランサーＦ ---Full Moon Dragon Umbrlancer F +--Full Moon Dragon Umbralancer F local s,id=GetID() function s.initial_effect(c) --fusion material diff --git a/rush/c160204024.lua b/rush/c160204024.lua index 371c39a80e..3fb3512694 100644 --- a/rush/c160204024.lua +++ b/rush/c160204024.lua @@ -1,5 +1,5 @@ -- ドラゴンズ・キックベース・マスター --- Dragon's Kickbase Master +--Sportsdragon Kickbase Master -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160204025.lua b/rush/c160204025.lua index 5b110e908b..b9f5a4c9d5 100644 --- a/rush/c160204025.lua +++ b/rush/c160204025.lua @@ -1,5 +1,5 @@ --ザ☆ワイバーン ---The☆Wyvern +--The Wyvern local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160204027.lua b/rush/c160204027.lua index 04fc192845..1c681a5577 100644 --- a/rush/c160204027.lua +++ b/rush/c160204027.lua @@ -1,5 +1,5 @@ -- ザ☆パワーアップ --- The☆Power-Up +--The Power Up local s,id=GetID() function s.initial_effect(c) --Increase ATK diff --git a/rush/c160204028.lua b/rush/c160204028.lua index 5ad802fa16..6ced97cc74 100644 --- a/rush/c160204028.lua +++ b/rush/c160204028.lua @@ -1,5 +1,5 @@ --ザ☆バリア ---The☆Barrier +--The Barrier local s,id=GetID() function s.initial_effect(c) --Opponent's attacking monster loses 400 ATK diff --git a/rush/c160204030.lua b/rush/c160204030.lua index de191616cb..3c687a3abe 100644 --- a/rush/c160204030.lua +++ b/rush/c160204030.lua @@ -32,7 +32,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) --Requirement Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) local ctdeck=Duel.GetFieldGroupCount(tp,LOCATION_DECK,0) - if ctdeck>3 then ctdeck=3 end + if ctdeck>3 then ctdeck=3 end local g=Duel.SelectMatchingCard(tp,s.tgfilter,tp,LOCATION_HAND,0,1,ctdeck,nil) local count=Duel.SendtoGrave(g,REASON_COST) --Effect diff --git a/rush/c160204032.lua b/rush/c160204032.lua index 317541a1a5..17e096aa60 100644 --- a/rush/c160204032.lua +++ b/rush/c160204032.lua @@ -1,5 +1,5 @@ --- レッド・ポーション (Rush) --- Red Medicine (Rush) +--レッド・ポーション (Rush) +--Red Medicine (Rush) local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160204035.lua b/rush/c160204035.lua index 7add6b95df..f0146f11f7 100644 --- a/rush/c160204035.lua +++ b/rush/c160204035.lua @@ -1,5 +1,5 @@ -- パーミリンド・ハイクロトロン --- Permylind Hicrotron +--Permillind Hicrotron local s,id=GetID() function s.initial_effect(c) --fusion material diff --git a/rush/c160204037.lua b/rush/c160204037.lua index 9fac223738..a87f0c1ae6 100644 --- a/rush/c160204037.lua +++ b/rush/c160204037.lua @@ -40,7 +40,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(700) c:RegisterEffect(e1) local ct=Duel.GetMatchingGroupCount(Card.IsCode,tp,LOCATION_GRAVE,0,nil,CARD_UPSTART_GOBLIN) diff --git a/rush/c160204038.lua b/rush/c160204038.lua index 729278a0ba..dce0c00679 100644 --- a/rush/c160204038.lua +++ b/rush/c160204038.lua @@ -1,5 +1,5 @@ ---漆黒シャイン王Gアークトーク ---Shining Black Corporate King Great Arktalk the Corrupt +--漆黒シャイン王Gアークトーク +--Worker Warrior - Sinister Chairman local s,id=GetID() function s.initial_effect(c) @@ -27,7 +27,7 @@ end function s.operation(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() --Requirement - Duel.PayLPCost(tp,600) + Duel.PayLPCost(tp,600) --Effect if c:IsRelateToEffect(e) and c:IsFaceup() then local atk=Duel.GetMatchingGroupCount(Card.IsRace,tp,LOCATION_GRAVE,0,e:GetHandler(),RACE_MACHINE) @@ -35,7 +35,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(atk*200) c:RegisterEffect(e1) local g=Duel.GetMatchingGroup(s.tdfilter,tp,LOCATION_GRAVE,0,nil,tp) diff --git a/rush/c160204039.lua b/rush/c160204039.lua index ab1cf583fb..9c0be65901 100644 --- a/rush/c160204039.lua +++ b/rush/c160204039.lua @@ -1,9 +1,10 @@ --刷新戦士シャイン・O ---Remodeled Corporate Soldier Shine Organizer +--Worker Warrior - Overhauled Organizer local s,id=GetID() function s.initial_effect(c) - --Special summon 1 Arktalk from Hand + --Special Summon 1 "Worker Warrior - Sinister CEO" from your hand local e1=Effect.CreateEffect(c) + e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_TOHAND) e1:SetType(EFFECT_TYPE_IGNITION) e1:SetRange(LOCATION_MZONE) @@ -13,7 +14,7 @@ function s.initial_effect(c) e1:SetOperation(s.operation) c:RegisterEffect(e1) end -s.listed_names={160006024} +s.listed_names={160006024} --"Worker Warrior - Sinister CEO" function s.costfilter(c) return c:IsSpellTrap() and c:IsAbleToGraveAsCost() end @@ -46,7 +47,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_OATH) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end end diff --git a/rush/c160204046.lua b/rush/c160204046.lua index b05b15863c..693c63126f 100644 --- a/rush/c160204046.lua +++ b/rush/c160204046.lua @@ -1,5 +1,5 @@ --闇 ---Yami +--Yami (Rush) local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160205026.lua b/rush/c160205026.lua index c4071c3746..094fd05e20 100644 --- a/rush/c160205026.lua +++ b/rush/c160205026.lua @@ -1,5 +1,5 @@ --プロト・サイバー・ドラゴン (Rush) ---Proto Cyber Dragon (Rush) +--Proto-Cyber Dragon (Rush) local s,id=GetID() function s.initial_effect(c) --Name becomes "Cyber Dragon" diff --git a/rush/c160205033.lua b/rush/c160205033.lua index 7149736e62..21e882f407 100644 --- a/rush/c160205033.lua +++ b/rush/c160205033.lua @@ -1,5 +1,5 @@ --エクスキューティー・フローア ---Executie Floor +--Executie Floa --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160205039.lua b/rush/c160205039.lua index 35796405ad..99b9f641ed 100644 --- a/rush/c160205039.lua +++ b/rush/c160205039.lua @@ -1,5 +1,5 @@ --エクスキューティー・スクランブル！ ---Excutie Scramble! +--Executie Scramble! local s,id=GetID() function s.initial_effect(c) --Special Summon 1 level 6 with 500 def diff --git a/rush/c160205047.lua b/rush/c160205047.lua index d4874ae768..4dd5af5ab4 100644 --- a/rush/c160205047.lua +++ b/rush/c160205047.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・アポカリプス ---Voidvelgr Apocalypse +--Voidvelg Apocalypse local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() diff --git a/rush/c160205060.lua b/rush/c160205060.lua index 9d67855560..af2c003cdf 100644 --- a/rush/c160205060.lua +++ b/rush/c160205060.lua @@ -1,5 +1,5 @@ --コバルト・コボルト ---Cobalt Kobold +--Cobalt Cobolt --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160205064.lua b/rush/c160205064.lua index e061bac36f..ff64c37ee1 100644 --- a/rush/c160205064.lua +++ b/rush/c160205064.lua @@ -1,5 +1,5 @@ --サタニウスの宝珠 ---Cintamani of Saturnius +--Saturnius' Orb --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160205133.lua b/rush/c160205133.lua index 2c9ef880fe..b77ccc70b8 100644 --- a/rush/c160205133.lua +++ b/rush/c160205133.lua @@ -1,3 +1,3 @@ --エクスキューティー・フローア ---Executie Floor +--Executie Floa Duel.LoadCardScriptAlias(160205033) diff --git a/rush/c160205147.lua b/rush/c160205147.lua index c337db3885..a3fb6e9f4e 100644 --- a/rush/c160205147.lua +++ b/rush/c160205147.lua @@ -1,3 +1,3 @@ --ヴォイドヴェルグ・アポカリプス ---Voidvelgr Apocalypse +--Voidvelg Apocalypse Duel.LoadCardScriptAlias(160205047) diff --git a/rush/c160206000.lua b/rush/c160206000.lua index 6f16541269..7b4aab547a 100644 --- a/rush/c160206000.lua +++ b/rush/c160206000.lua @@ -1,3 +1,4 @@ +--メテオ・ブラック・ドラゴン --Meteor Black Dragon (Rush) local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160206004.lua b/rush/c160206004.lua index ce8e7f01ac..7bcf58c042 100644 --- a/rush/c160206004.lua +++ b/rush/c160206004.lua @@ -1,5 +1,5 @@ --合成魔獣 ガーゼット ---Maju Garzett +--Maju Garzett (Rush) local s,id=GetID() function s.initial_effect(c) --tribute check diff --git a/rush/c160206021.lua b/rush/c160206021.lua index 081f4a8187..a1d81250d7 100644 --- a/rush/c160206021.lua +++ b/rush/c160206021.lua @@ -1,5 +1,5 @@ --未熟な魔王 ---Inexperienced Dark Ruler +--Embryonic Dark Ruler --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160207004.lua b/rush/c160207004.lua index 95847c9ff8..0788a469c4 100644 --- a/rush/c160207004.lua +++ b/rush/c160207004.lua @@ -1,3 +1,3 @@ --超魔輝獣マグナム・オーバーロード［Ｌ］ ---Supreme Beast Magnum Overlord [L] +--Supreme Wildgleam Magnum Overlord [L] Duel.LoadCardScriptAlias(160428001) diff --git a/rush/c160207005.lua b/rush/c160207005.lua index bf36990fd9..36ef51da39 100644 --- a/rush/c160207005.lua +++ b/rush/c160207005.lua @@ -1,3 +1,3 @@ --超魔輝獣マグナム・オーバーロード ---Supreme Beast Magnum Overlord +--Supreme Wildgleam Magnum Overlord Duel.LoadCardScriptAlias(160428002) diff --git a/rush/c160207006.lua b/rush/c160207006.lua index 870dfdc195..e5b8657737 100644 --- a/rush/c160207006.lua +++ b/rush/c160207006.lua @@ -1,3 +1,3 @@ --超魔輝獣マグナム・オーバーロード［Ｒ］ ---Supreme Beast Magnum Overlord [R] +--Supreme Wildgleam Magnum Overlord [R] Duel.LoadCardScriptAlias(160428003) diff --git a/rush/c160207007.lua b/rush/c160207007.lua index 2e4e205431..2ca8942d86 100644 --- a/rush/c160207007.lua +++ b/rush/c160207007.lua @@ -1,3 +1,3 @@ --超魔旗艦マグナム・オーバーロード［Ｌ］ ---Super Magiflag Ship Magnum Over Road [L] +--Supreme Skystream Magnum Overlord [L] Duel.LoadCardScriptAlias(160203001) diff --git a/rush/c160207008.lua b/rush/c160207008.lua index 83e5bc59b7..51ea5efd2c 100644 --- a/rush/c160207008.lua +++ b/rush/c160207008.lua @@ -1,3 +1,3 @@ -- 超魔旗艦マグナム・オーバーロード --- Supreme Flagship Magnum Overlord +--Supreme Skystream Magnum Overlord Duel.LoadCardScriptAlias(160203002) diff --git a/rush/c160207009.lua b/rush/c160207009.lua index fed1e9d257..70632d08ad 100644 --- a/rush/c160207009.lua +++ b/rush/c160207009.lua @@ -1,3 +1,3 @@ -- 超魔旗艦マグナム・オーバーロード[R] ---Super Magiflag Ship Magnum Over Road [R] +--Supreme Skystream Magnum Overlord [R] Duel.LoadCardScriptAlias(160203003) diff --git a/rush/c160207046.lua b/rush/c160207046.lua index 33996a7719..f032101817 100644 --- a/rush/c160207046.lua +++ b/rush/c160207046.lua @@ -1,5 +1,5 @@ --アビス・ガッシュ ---Abyss Gush +--Abyss Gash --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160207059.lua b/rush/c160207059.lua index 66420e8017..97788f5171 100644 --- a/rush/c160207059.lua +++ b/rush/c160207059.lua @@ -1,3 +1,3 @@ -- 鋼機神ミラーイノベイター ---Steeltek Deity Mirror Innovator +--Steel Mech Lord Mirror Innovator Duel.LoadCardScriptAlias(160004015) diff --git a/rush/c160207060.lua b/rush/c160207060.lua index 0c00e6128b..bb437012a4 100644 --- a/rush/c160207060.lua +++ b/rush/c160207060.lua @@ -1,3 +1,3 @@ --海竜－ダイダロス ---Levia-Dragon - Daedalus +--Levia-Dragon - Daedalus (Rush) Duel.LoadCardScriptAlias(160007000) diff --git a/rush/c160208001.lua b/rush/c160208001.lua index cc798d1545..87f8c6e361 100644 --- a/rush/c160208001.lua +++ b/rush/c160208001.lua @@ -1,5 +1,5 @@ --ハーピィ三姉妹［Ｌ］ ---Harpie Ladies [L] +--Harpie Lady Sisters [L] --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -8,7 +8,7 @@ function s.initial_effect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CHANGE_CODE) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) - e1:SetRange(LOCATION_GRAVE+LOCATION_MZONE) + e1:SetRange(LOCATION_GRAVE|LOCATION_MZONE) e1:SetValue(160208002) c:RegisterEffect(e1) c:AddSideMaximumHandler(e1) diff --git a/rush/c160208003.lua b/rush/c160208003.lua index c9ba33c93d..a1e24daaf7 100644 --- a/rush/c160208003.lua +++ b/rush/c160208003.lua @@ -1,5 +1,5 @@ --ハーピィ三姉妹［Ｒ］ ---Harpie Ladies [R] +--Harpie Lady Sisters [R] --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -8,7 +8,7 @@ function s.initial_effect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CHANGE_CODE) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) - e1:SetRange(LOCATION_GRAVE+LOCATION_MZONE) + e1:SetRange(LOCATION_GRAVE|LOCATION_MZONE) e1:SetValue(160208002) c:RegisterEffect(e1) c:AddSideMaximumHandler(e1) diff --git a/rush/c160208004.lua b/rush/c160208004.lua index 84778e2ad9..c66088e6a1 100644 --- a/rush/c160208004.lua +++ b/rush/c160208004.lua @@ -8,7 +8,7 @@ function s.initial_effect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_CHANGE_CODE) e1:SetProperty(EFFECT_FLAG_SINGLE_RANGE) - e1:SetRange(LOCATION_GRAVE+LOCATION_MZONE) + e1:SetRange(LOCATION_GRAVE|LOCATION_MZONE) e1:SetValue(CARD_HARPIE_LADY) c:RegisterEffect(e1) --atkup diff --git a/rush/c160208009.lua b/rush/c160208009.lua index 39d340c408..11461bbb29 100644 --- a/rush/c160208009.lua +++ b/rush/c160208009.lua @@ -1,5 +1,5 @@ --ハーピィ・カーラ ---Harpie Carla +--Harpie Cara --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160208018.lua b/rush/c160208018.lua index ebd0747e9e..6880514aef 100644 --- a/rush/c160208018.lua +++ b/rush/c160208018.lua @@ -1,5 +1,5 @@ --環幻楽鬼神トランスゴッドブレス ---Trancegodbreath the Music Fiend Deity +--Divinebreath the Orchestral Music Fiend --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160208024.lua b/rush/c160208024.lua index 743152554e..34cc3b4544 100644 --- a/rush/c160208024.lua +++ b/rush/c160208024.lua @@ -25,7 +25,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() --Effect Duel.DiscardDeck(tp,3,REASON_EFFECT) - if Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsAttackAbove,3000),tp,0,LOCATION_MZONE,1,nil) + if Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsAttackAbove,3000),tp,0,LOCATION_MZONE,1,nil) and Duel.IsPlayerCanDraw(tp,3) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.BreakEffect() Duel.Draw(tp,3,REASON_EFFECT) diff --git a/rush/c160208035.lua b/rush/c160208035.lua index 3180c16d2b..866460e419 100644 --- a/rush/c160208035.lua +++ b/rush/c160208035.lua @@ -1,5 +1,5 @@ --虎死眈々 ---Tiger Doom Sight +--Tiger Glare --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160208036.lua b/rush/c160208036.lua index acd33fe938..965a0d73f6 100644 --- a/rush/c160208036.lua +++ b/rush/c160208036.lua @@ -1,5 +1,5 @@ --三千破界 ---Universal Destruction +--Destruction of the Universe --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160208042.lua b/rush/c160208042.lua index 54f7d2acde..4c306179f8 100644 --- a/rush/c160208042.lua +++ b/rush/c160208042.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetTarget(s.target) e1:SetOperation(s.operation) c:RegisterEffect(e1) -end +end s.listed_names={160004024} function s.tdfilter(c) return c:IsMonster() and c:IsRace(RACE_WYRM) and c:IsAbleToDeckOrExtraAsCost() diff --git a/rush/c160208044.lua b/rush/c160208044.lua index 062778c122..ed89063d35 100644 --- a/rush/c160208044.lua +++ b/rush/c160208044.lua @@ -1,3 +1,3 @@ -- 幻刃竜ビルド・ドラゴン --- Build Dragon the Mythic Sword Dragon +--Constructor Wyrm Buildragon Duel.LoadCardScriptAlias(160004024) diff --git a/rush/c160208057.lua b/rush/c160208057.lua index ee4643f0b0..efb644d26b 100644 --- a/rush/c160208057.lua +++ b/rush/c160208057.lua @@ -18,7 +18,7 @@ function s.zfilter(c) end function s.condition(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetAttacker() - return tc:IsControler(1-tp) and tc:IsLevelBelow(8) and Duel.IsExistingMatchingCard(s.zfilter,tp,LOCATION_MZONE,0,1,nil) + return tc:IsControler(1-tp) and tc:IsLevelBelow(8) and Duel.IsExistingMatchingCard(s.zfilter,tp,LOCATION_MZONE,0,1,nil) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return true end diff --git a/rush/c160208058.lua b/rush/c160208058.lua index 09be724720..9a52e13929 100644 --- a/rush/c160208058.lua +++ b/rush/c160208058.lua @@ -33,7 +33,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) Duel.HintSelection(g,true) Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT) local dg=Duel.GetMatchingGroup(s.desfilter,tp,0,LOCATION_MZONE,nil) - if g:Filter(Card.IsLocation,nil,LOCATION_DECK|LOCATION_EXTRA):GetSum(Card.GetLevel)>=16 + if g:Filter(Card.IsLocation,nil,LOCATION_DECK|LOCATION_EXTRA):GetSum(Card.GetLevel)>=16 and #dg>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.BreakEffect() Duel.Destroy(dg,REASON_EFFECT) diff --git a/rush/c160208059.lua b/rush/c160208059.lua index 7083e1f31e..181d76a318 100644 --- a/rush/c160208059.lua +++ b/rush/c160208059.lua @@ -22,7 +22,7 @@ function s.filter1(c,tp) return c:IsSummonPlayer(1-tp) and c:IsLevelAbove(7) and c:IsFaceup() end function s.condition(e,tp,eg,ep,ev,re,r,rp) - return eg:IsExists(s.filter1,1,nil,tp) + return eg:IsExists(s.filter1,1,nil,tp) end function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToGraveAsCost,tp,LOCATION_MZONE,0,1,nil) end diff --git a/rush/c160209002.lua b/rush/c160209002.lua index 79826e6a61..a44e936496 100644 --- a/rush/c160209002.lua +++ b/rush/c160209002.lua @@ -33,8 +33,8 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) if Duel.GetLocationCount(tp,LOCATION_MZONE)<1 then return end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp) - if Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)>0 - and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.attfilter),tp,0,LOCATION_MZONE,1,nil) + if Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)>0 + and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.attfilter),tp,0,LOCATION_MZONE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP) local g=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(s.attfilter),tp,0,LOCATION_MZONE,1,3,nil) diff --git a/rush/c160209013.lua b/rush/c160209013.lua index 77ed06d0f4..d5db290e63 100644 --- a/rush/c160209013.lua +++ b/rush/c160209013.lua @@ -1,5 +1,5 @@ --最強旗獣ボルトライコーン ---Ultimate Flag Beast Bolt Tricorn +--Ultimate Flag Beast Boltricorn --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160209018.lua b/rush/c160209018.lua index d34e7740c7..a12302c733 100644 --- a/rush/c160209018.lua +++ b/rush/c160209018.lua @@ -15,7 +15,7 @@ function s.initial_effect(c) c:RegisterEffect(e1) end function s.cfilter(c) - return c:IsMonster() and c:IsLevelAbove(5) and c:IsRace(RACE_SPELLCASTER) and c:IsAbleToDeckOrExtraAsCost() + return c:IsMonster() and c:IsLevelAbove(5) and c:IsRace(RACE_SPELLCASTER) and c:IsAbleToDeckOrExtraAsCost() end function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_GRAVE,0,2,nil) end diff --git a/rush/c160209019.lua b/rush/c160209019.lua index 765f174aa9..2becd3eed9 100644 --- a/rush/c160209019.lua +++ b/rush/c160209019.lua @@ -28,7 +28,7 @@ end function s.drop(e,tp,eg,ep,ev,re,r,rp) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) local tc=Duel.SelectMatchingCard(tp,s.drcostfilter,tp,LOCATION_HAND,0,1,1,nil):GetFirst() - if Duel.SendtoGrave(tc,REASON_COST)==1 then + if Duel.SendtoGrave(tc,REASON_COST)==1 then Duel.BreakEffect() Duel.Draw(tp,1,REASON_EFFECT) if Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_GRAVE,0,2,nil,CARD_STRAYNGE_CAT,160209016) then diff --git a/rush/c160209020.lua b/rush/c160209020.lua index 31bf02f782..593defc8da 100644 --- a/rush/c160209020.lua +++ b/rush/c160209020.lua @@ -17,7 +17,7 @@ function s.filter(c) return c:IsFaceup() and c:IsRace(RACE_SPELLCASTER) and c:GetBaseAttack()==0 and not c:IsMaximumModeSide() end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_MZONE,0,1,nil) + if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_MZONE,0,1,nil) and Duel.GetFieldGroupCountRush(tp,0,LOCATION_MZONE)>0 end end function s.thfilter(c) diff --git a/rush/c160209021.lua b/rush/c160209021.lua index 977c534e8a..2580ea8ec7 100644 --- a/rush/c160209021.lua +++ b/rush/c160209021.lua @@ -34,7 +34,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) if Duel.Draw(p,d,REASON_EFFECT)>0 then local dg=Duel.GetMatchingGroup(Card.IsSpellTrap,tp,0,LOCATION_ONFIELD,nil) - if Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsAttribute,ATTRIBUTE_LIGHT),tp,0,LOCATION_MZONE,1,nil) + if Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsAttribute,ATTRIBUTE_LIGHT),tp,0,LOCATION_MZONE,1,nil) and #dg>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) local sg=dg:Select(tp,1,1,nil) diff --git a/rush/c160209024.lua b/rush/c160209024.lua index 3a707d2869..e4ef2f51fe 100644 --- a/rush/c160209024.lua +++ b/rush/c160209024.lua @@ -18,7 +18,7 @@ s.listed_names={CARD_STRAYNGE_CAT,160209016} function s.condition(e,tp,eg,ep,ev,re,r,rp) local a=Duel.GetAttacker() local tc=Duel.GetAttackTarget() - return a and a:IsControler(1-tp) and + return a and a:IsControler(1-tp) and ((tc and tc:IsFaceup() and tc:IsAttack(0) and tc:IsControler(tp)) or (Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_GRAVE,0,1,nil,CARD_STRAYNGE_CAT,160209016))) end function s.activate(e,tp,eg,ep,ev,re,r,rp) diff --git a/rush/c160209026.lua b/rush/c160209026.lua index 72b0cd8a30..2d785a38e9 100644 --- a/rush/c160209026.lua +++ b/rush/c160209026.lua @@ -48,7 +48,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local dg=g:Select(tp,1,1,nil) dg:AddMaximumCheck() Duel.HintSelection(dg,true) - local ct=Duel.Destroy(dg,REASON_EFFECT) + local ct=Duel.Destroy(dg,REASON_EFFECT) local g2=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.spfilter),tp,LOCATION_GRAVE,0,nil,e,tp) if ct>0 and #g2>0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) diff --git a/rush/c160209029.lua b/rush/c160209029.lua index 0c59481452..283fe632b7 100644 --- a/rush/c160209029.lua +++ b/rush/c160209029.lua @@ -1,4 +1,5 @@ --Twin Edge Fire Dragon +--Twin Edge Fire Dragon local s,id=GetID() function s.initial_effect(c) --Make 1 of your Dragon monsters gain 500 ATK diff --git a/rush/c160209042.lua b/rush/c160209042.lua index 5f5dc0869e..c6c63b4bb1 100644 --- a/rush/c160209042.lua +++ b/rush/c160209042.lua @@ -34,7 +34,7 @@ function s.setfilter(c) end function s.operation(e,tp,eg,ep,ev,re,r,rp) --Requirement - Duel.PayLPCost(tp,300) + Duel.PayLPCost(tp,300) --Effect Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_GRAVE,0,1,1,nil) diff --git a/rush/c160209043.lua b/rush/c160209043.lua index a39086d7ef..3ab3e9e9ca 100644 --- a/rush/c160209043.lua +++ b/rush/c160209043.lua @@ -1,3 +1,3 @@ --ジャンク・ブレイカー ---Fiendish Commander Yameruler +--Yamiruler the Dark Delayer Duel.LoadCardScriptAlias(160001029) diff --git a/rush/c160209048.lua b/rush/c160209048.lua index f86184eda1..70c004f5a9 100644 --- a/rush/c160209048.lua +++ b/rush/c160209048.lua @@ -3,7 +3,7 @@ --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) - -- Set + -- Set local e1=Effect.CreateEffect(c) e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_LEAVE_GRAVE) @@ -32,8 +32,8 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET) local g=Duel.SelectMatchingCard(tp,s.ssfilter,tp,LOCATION_GRAVE,0,1,ft,nil) if #g==0 then return end - if Duel.SSet(tp,g)>0 and g:IsExists(Card.IsCode,1,nil,52097679) - and Duel.IsExistingMatchingCard(Card.IsCanChangePositionRush,tp,LOCATION_MZONE,0,1,nil) + if Duel.SSet(tp,g)>0 and g:IsExists(Card.IsCode,1,nil,52097679) + and Duel.IsExistingMatchingCard(Card.IsCanChangePositionRush,tp,LOCATION_MZONE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_POSCHANGE) local g2=Duel.SelectMatchingCard(tp,Card.IsCanChangePositionRush,tp,0,LOCATION_MZONE,1,3,nil) diff --git a/rush/c160209059.lua b/rush/c160209059.lua index 00d07f4d9d..0aad53aa05 100644 --- a/rush/c160209059.lua +++ b/rush/c160209059.lua @@ -33,7 +33,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) end end local ct2=0 - if #ct==1 then + if #ct==1 then ct2=Duel.DiscardDeck(tp,ct[1],REASON_COST) else Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(id,2)) diff --git a/rush/c160209060.lua b/rush/c160209060.lua index eaf6db50c0..38320fc6b7 100644 --- a/rush/c160209060.lua +++ b/rush/c160209060.lua @@ -1,3 +1,3 @@ --彩光のプリマギターナ ---Prima Guitarna of the Colorful Light +--Prima Guitarna the Shining Superstar Duel.LoadCardScriptAlias(CARD_PRIMA_GUITARNA) diff --git a/rush/c160209063.lua b/rush/c160209063.lua index a4afec8c89..5b82777451 100644 --- a/rush/c160209063.lua +++ b/rush/c160209063.lua @@ -26,8 +26,8 @@ end function s.operation(e,tp,eg,ep,ev,re,r,rp) --Effect if Duel.DiscardDeck(tp,2,REASON_EFFECT)~=2 then return end - if Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsCode,160209059),tp,LOCATION_MZONE,0,1,nil) - and Duel.IsExistingMatchingCard(Card.IsFacedown,tp,0,LOCATION_ONFIELD,1,nil) + if Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsCode,160209059),tp,LOCATION_MZONE,0,1,nil) + and Duel.IsExistingMatchingCard(Card.IsFacedown,tp,0,LOCATION_ONFIELD,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM) local g=Duel.SelectMatchingCard(tp,Card.IsFacedown,tp,0,LOCATION_ONFIELD,1,2,nil) diff --git a/rush/c160209064.lua b/rush/c160209064.lua index f7066832cf..5c8184fffd 100644 --- a/rush/c160209064.lua +++ b/rush/c160209064.lua @@ -26,7 +26,7 @@ end function s.operation(e,tp,eg,ep,ev,re,r,rp) --Effect if Duel.DiscardDeck(tp,2,REASON_EFFECT)~=2 then return end - if Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsCode,CARD_PRIMA_GUITARNA),tp,LOCATION_MZONE,0,1,nil) + if Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsCode,CARD_PRIMA_GUITARNA),tp,LOCATION_MZONE,0,1,nil) and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,LOCATION_MZONE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATKDEF) diff --git a/rush/c160209071.lua b/rush/c160209071.lua index 7e33b46819..28a9a1b971 100644 --- a/rush/c160209071.lua +++ b/rush/c160209071.lua @@ -49,7 +49,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp,chk) Duel.RegisterEffect(e1,tp) end function s.rescon(sg,e,tp,mg) - return sg:FilterCount(Card.IsCode,nil,160306003)<2 + return sg:FilterCount(Card.IsCode,nil,160306003)<2 and sg:FilterCount(Card.IsCode,nil,160002024)<2 and sg:FilterCount(Card.IsCode,nil,160201029)<2 and sg:FilterCount(Card.IsCode,nil,160306012)<2 diff --git a/rush/c160209073.lua b/rush/c160209073.lua index 98534dc77c..b8be6ebcab 100644 --- a/rush/c160209073.lua +++ b/rush/c160209073.lua @@ -1,4 +1,5 @@ --Lullalabind +--Lullalabind local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160209080.lua b/rush/c160209080.lua index 72ac3c91bb..def2fe1cd3 100644 --- a/rush/c160209080.lua +++ b/rush/c160209080.lua @@ -1,5 +1,5 @@ --剣黎の魔術師 ---Swordawn Magician +--Dark Sword Magician --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160209083.lua b/rush/c160209083.lua index bd978d4805..14b7af2e72 100644 --- a/rush/c160209083.lua +++ b/rush/c160209083.lua @@ -19,8 +19,8 @@ function s.spfilter(c,e,tp) end function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 - and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,nil,e,tp) end - Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND+LOCATION_GRAVE) + and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND|LOCATION_GRAVE,0,1,nil,e,tp) end + Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND|LOCATION_GRAVE) end function s.spop(e,tp,eg,ep,ev,re,r,rp,chk) --Effect @@ -28,7 +28,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp,chk) if ft<1 then return end if Duel.IsPlayerAffectedByEffect(tp,CARD_BLUEEYES_SPIRIT) then ft=1 end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) - local sg=Duel.GetMatchingGroup(s.spfilter,tp,LOCATION_HAND+LOCATION_GRAVE,0,nil,e,tp) + local sg=Duel.GetMatchingGroup(s.spfilter,tp,LOCATION_HAND|LOCATION_GRAVE,0,nil,e,tp) local tg=aux.SelectUnselectGroup(sg,1,tp,1,math.min(ft,2),s.rescon,1,tp) if #tg>0 then Duel.SpecialSummon(tg,0,tp,tp,false,false,POS_FACEUP) diff --git a/rush/c160210014.lua b/rush/c160210014.lua index b919ca9558..2e7be6158f 100644 --- a/rush/c160210014.lua +++ b/rush/c160210014.lua @@ -1,3 +1,3 @@ --カリス魔杖デス・ワンド ---Magic Scepter of Charis - Death Wand +--Charis Magic Scepter - Death Wand Duel.LoadCardScriptAlias(160013053) diff --git a/rush/c160210018.lua b/rush/c160210018.lua index 80ed840812..a98019a31f 100644 --- a/rush/c160210018.lua +++ b/rush/c160210018.lua @@ -48,10 +48,10 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) if #g==3 and #sg>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) local tg=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(Card.IsMonster),tp,0,LOCATION_MZONE,1,1,nil) - if #tg>0 then + if #tg>0 then tg=tg:AddMaximumCheck() Duel.HintSelection(tg) - Duel.Destroy(tg,REASON_EFFECT) + Duel.Destroy(tg,REASON_EFFECT) end end end \ No newline at end of file diff --git a/rush/c160210019.lua b/rush/c160210019.lua index 2cd4a2fb0c..173cab3d91 100644 --- a/rush/c160210019.lua +++ b/rush/c160210019.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・カオスマキア ---Voidvelgr Chaosmachia +--Voidvelg Chaosmachia --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160210020.lua b/rush/c160210020.lua index a6d7a64c95..1f74722234 100644 --- a/rush/c160210020.lua +++ b/rush/c160210020.lua @@ -18,7 +18,7 @@ function s.initial_effect(c) c:RegisterEffect(e1) end s.listed_names={CARD_REDEYES_B_DRAGON,CARD_SUMMONED_SKULL} -s.material_setcode={0x3b,0x45} +s.material_setcode={SET_RED_EYES,SET_ARCHFIEND } function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsPlayerCanDiscardDeckAsCost(tp,1) end end diff --git a/rush/c160210032.lua b/rush/c160210032.lua index d5cfe9a8da..56ad48f2ee 100644 --- a/rush/c160210032.lua +++ b/rush/c160210032.lua @@ -1,5 +1,5 @@ --強制脱出装置 ---Compulsory Evacuation Device +--Compulsory Evacuation Device (Rush) --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160210036.lua b/rush/c160210036.lua index 21a9a66b95..30dc878f6d 100644 --- a/rush/c160210036.lua +++ b/rush/c160210036.lua @@ -1,5 +1,5 @@ --焔魔神ルシュレス ---Blaze Fiend Deity Luculess +--Blaze Fiend Overlord Luciless --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -24,7 +24,7 @@ function s.condition(e,tp,eg,ep,ev,re,r,rp) return Duel.IsExistingMatchingCard(Card.IsRace,tp,LOCATION_GRAVE,0,3,nil,RACE_FIEND) end function s.filter(c,e,tp) - return c:IsType(TYPE_MAXIMUM) and c:IsAttribute(ATTRIBUTE_FIRE) + return c:IsType(TYPE_MAXIMUM) and c:IsAttribute(ATTRIBUTE_FIRE) and (c:IsAbleToHand() or (Duel.GetMZoneCount(tp)>0 and c:IsCanBeSpecialSummoned(e,0,tp,false,false))) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/rush/c160210037.lua b/rush/c160210037.lua index e352c515de..0bff6b19ef 100644 --- a/rush/c160210037.lua +++ b/rush/c160210037.lua @@ -21,7 +21,7 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsPlayerCanDiscardDeckAsCost(tp,1) end end function s.filter(c) - return c:IsFaceup() and c:IsRace(RACE_GALAXY|RACE_DRAGON|RACE_MACHINE|RACE_SPELLCASTER) + return c:IsFaceup() and c:IsRace(RACE_GALAXY|RACE_DRAGON|RACE_MACHINE|RACE_SPELLCASTER) and c:IsAttackAbove(4000) and c:GetBaseAttack()>=4000 and c:IsNotMaximumModeSide() end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/rush/c160210050.lua b/rush/c160210050.lua index f3ed70f235..fb3cf7212a 100644 --- a/rush/c160210050.lua +++ b/rush/c160210050.lua @@ -39,7 +39,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp) local g2=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,nil) - if #g>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP_DEFENSE)>0 + if #g>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP_DEFENSE)>0 and g:GetFirst():IsLevelAbove(5) and #g2>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) local sg=g2:Select(tp,1,1,nil) diff --git a/rush/c160210058.lua b/rush/c160210058.lua index b68b0fee73..a43fa960fc 100644 --- a/rush/c160210058.lua +++ b/rush/c160210058.lua @@ -1,4 +1,5 @@ --ハンマーシュート +--Hammer Shot (Rush) local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160210064.lua b/rush/c160210064.lua index 87db995b89..d7bfd3094f 100644 --- a/rush/c160210064.lua +++ b/rush/c160210064.lua @@ -1,5 +1,5 @@ --ＳＰアシスタント・ヒーヤ ---Super Assistant Hiya +--Icelyn the Super Assistant --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160210065.lua b/rush/c160210065.lua index 617e6a9b79..8d851b0a82 100644 --- a/rush/c160210065.lua +++ b/rush/c160210065.lua @@ -1,5 +1,5 @@ --ＳＰアシスタント・ビリ ---Super Assistant Biri +--Sparkle the Super Assistant --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -33,7 +33,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) Duel.HintSelection(tg,true) if Duel.SendtoDeck(tg,nil,0,REASON_EFFECT)>0 then if Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_GRAVE,0,1,nil,160316023) - and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.tdfilter),tp,LOCATION_GRAVE,0,2,nil) + and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.tdfilter),tp,LOCATION_GRAVE,0,2,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK) local tg=Duel.SelectMatchingCard(tp,s.tdfilter,tp,LOCATION_GRAVE,0,2,2,nil) diff --git a/rush/c160210067.lua b/rush/c160210067.lua index f1bfe3eac8..f2ab56f457 100644 --- a/rush/c160210067.lua +++ b/rush/c160210067.lua @@ -43,8 +43,8 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) Duel.ShuffleDeck(tp) --Effect local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) - if Duel.Draw(p,d,REASON_EFFECT)>0 - and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.atkfilter),tp,0,LOCATION_MZONE,1,nil) + if Duel.Draw(p,d,REASON_EFFECT)>0 + and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.atkfilter),tp,0,LOCATION_MZONE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATKDEF) local g=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(s.atkfilter),tp,0,LOCATION_MZONE,1,3,nil) diff --git a/rush/c160210074.lua b/rush/c160210074.lua index 7feb082a0a..978ac7226a 100644 --- a/rush/c160210074.lua +++ b/rush/c160210074.lua @@ -39,7 +39,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) if Duel.ChangePosition(c,POS_FACEUP_DEFENSE,0,0,0)<1 then return end --Effect local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) - if Duel.Damage(p,d,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil) + if Duel.Damage(p,d,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil) and Duel.IsPlayerCanDraw(tp,1) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.BreakEffect() Duel.Draw(tp,1,REASON_EFFECT) diff --git a/rush/c160210075.lua b/rush/c160210075.lua index e0d5da6349..80804282ea 100644 --- a/rush/c160210075.lua +++ b/rush/c160210075.lua @@ -1,5 +1,5 @@ --ツイン・クールスター ---Twin Twinkle Star +--Twin Coolstars --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160210078.lua b/rush/c160210078.lua index 436c244eda..ee35ae99ae 100644 --- a/rush/c160210078.lua +++ b/rush/c160210078.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) c:RegisterEffect(e1) end function s.condition(e,tp,eg,ep,ev,re,r,rp) - return Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsLevelAbove,7),tp,0,LOCATION_MZONE,1,nil) + return Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsLevelAbove,7),tp,0,LOCATION_MZONE,1,nil) and (not Duel.IsPlayerAffectedByEffect(tp,FLAG_NO_TRIBUTE)) and e:GetHandler():CanBeDoubleTribute(FLAG_DOUBLE_TRIB_FIEND) end function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/rush/c160210082.lua b/rush/c160210082.lua index ac1ba7e93a..55e74b205b 100644 --- a/rush/c160210082.lua +++ b/rush/c160210082.lua @@ -18,7 +18,7 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return e:GetHandler():IsAbleToGraveAsCost() end end function s.filter(c) - return c:IsFaceup() and c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsRace(RACE_SPELLCASTER) + return c:IsFaceup() and c:IsAttribute(ATTRIBUTE_LIGHT) and c:IsRace(RACE_SPELLCASTER) and c:GetEquipCount()>0 and c:CanAttack() and c:IsNotMaximumModeSide() end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/rush/c160210085.lua b/rush/c160210085.lua index d327955b19..911c9b7955 100644 --- a/rush/c160210085.lua +++ b/rush/c160210085.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・モルゲンスタイン ---Voidvelgr Morgenstein +--Voidvelg Morgenstein --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160211016.lua b/rush/c160211016.lua index 4c4f953f76..cac70073ae 100644 --- a/rush/c160211016.lua +++ b/rush/c160211016.lua @@ -22,7 +22,7 @@ function s.cfilter2(c) return c:IsMonster() and not c:IsRace(RACE_CYBERSE) end function s.condition(e,tp,eg,ep,ev,re,r,rp) - return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil) + return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil) and Duel.IsExistingMatchingCard(Card.IsMonster,tp,LOCATION_GRAVE,0,1,nil) and not Duel.IsExistingMatchingCard(s.cfilter2,tp,LOCATION_GRAVE,0,1,nil) end diff --git a/rush/c160211019.lua b/rush/c160211019.lua index 75a2edae91..8bd5736e48 100644 --- a/rush/c160211019.lua +++ b/rush/c160211019.lua @@ -24,7 +24,7 @@ function s.spfilter(c,e,tp) return c:IsRace(RACE_CYBERSE) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 + if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp) end Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND) diff --git a/rush/c160211020.lua b/rush/c160211020.lua index e31b09c2ab..331a6972fe 100644 --- a/rush/c160211020.lua +++ b/rush/c160211020.lua @@ -19,7 +19,7 @@ function s.checkmat(tp,sg,fc) return sg:GetClassCount(Card.GetLocation)==1 end function s.fextra(e,tp,mg) - return Duel.GetMatchingGroup(s.mfilter,tp,LOCATION_ONFIELD+LOCATION_HAND,0,nil),s.checkmat + return Duel.GetMatchingGroup(s.mfilter,tp,LOCATION_ONFIELD|LOCATION_HAND,0,nil),s.checkmat end function s.cfilter(c) return c:IsLocation(LOCATION_GRAVE) and c:IsOriginalCodeRule(160211009) diff --git a/rush/c160211022.lua b/rush/c160211022.lua index 59b92f5caa..0809bc02d2 100644 --- a/rush/c160211022.lua +++ b/rush/c160211022.lua @@ -37,7 +37,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp) - if #g>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)>0 + if #g>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)>0 and Duel.IsExistingMatchingCard(s.tgfilter,tp,LOCATION_HAND,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE) diff --git a/rush/c160211023.lua b/rush/c160211023.lua index 4b23216acb..080d6fe569 100644 --- a/rush/c160211023.lua +++ b/rush/c160211023.lua @@ -40,10 +40,10 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) if #sg>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) local tg=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(Card.IsMonster),tp,0,LOCATION_MZONE,1,1,nil) - if #tg>0 then + if #tg>0 then tg=tg:AddMaximumCheck() Duel.HintSelection(tg,true) - Duel.Destroy(tg,REASON_EFFECT) + Duel.Destroy(tg,REASON_EFFECT) end end end diff --git a/rush/c160211035.lua b/rush/c160211035.lua index df28e4165a..8519f11612 100644 --- a/rush/c160211035.lua +++ b/rush/c160211035.lua @@ -33,14 +33,14 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) if Duel.SendtoGrave(g,REASON_COST)<1 then return end --Effect local sg=Duel.GetMatchingGroup(aux.FilterMaximumSideFunctionEx(Card.IsMonster),tp,0,LOCATION_MZONE,nil) - if Duel.Draw(tp,2,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_MZONE,0,1,nil) + if Duel.Draw(tp,2,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_MZONE,0,1,nil) and #sg>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) local tg=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(Card.IsMonster),tp,0,LOCATION_MZONE,1,1,nil) - if #tg>0 then + if #tg>0 then tg=tg:AddMaximumCheck() Duel.HintSelection(tg) - Duel.Destroy(tg,REASON_EFFECT) + Duel.Destroy(tg,REASON_EFFECT) end end end \ No newline at end of file diff --git a/rush/c160211048.lua b/rush/c160211048.lua index a86b5bb8b7..1145bb534a 100644 --- a/rush/c160211048.lua +++ b/rush/c160211048.lua @@ -74,6 +74,6 @@ function s.checkop(e,tp,eg,ep,ev,re,r,rp) local tg=Duel.GetAttackTarget() if tg==nil then local fid=eg:GetFirst():GetFieldID() - e:GetLabelObject():SetLabel(fid) + e:GetLabelObject():SetLabel(fid) end end \ No newline at end of file diff --git a/rush/c160211054.lua b/rush/c160211054.lua index b1b8ca72c4..b208332327 100644 --- a/rush/c160211054.lua +++ b/rush/c160211054.lua @@ -16,7 +16,7 @@ function s.initial_effect(c) c:RegisterEffect(e1) end function s.cfilter(c,tp) - return c:GetReasonPlayer()==1-tp and c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousControler(tp) + return c:GetReasonPlayer()==1-tp and c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousControler(tp) and (c:IsReason(REASON_EFFECT) or (c:IsReason(REASON_BATTLE) and Duel.GetAttacker():IsControler(1-tp))) end function s.condition(e,tp,eg,ep,ev,re,r,rp) diff --git a/rush/c160211070.lua b/rush/c160211070.lua index e90f04a361..0fa6e213bb 100644 --- a/rush/c160211070.lua +++ b/rush/c160211070.lua @@ -45,9 +45,9 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) if Duel.SendtoGrave(g,REASON_COST)<1 then return end --Effect local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) - if Duel.Draw(p,d,REASON_EFFECT)>0 + if Duel.Draw(p,d,REASON_EFFECT)>0 and Duel.GetMatchingGroupCount(s.cfilter2,tp,LOCATION_MZONE,0,nil)==3 - and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_GRAVE,0,1,nil) + and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_GRAVE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) local g2=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_GRAVE,0,1,1,nil) diff --git a/rush/c160211071.lua b/rush/c160211071.lua index 84c2141f40..2e1ece6c76 100644 --- a/rush/c160211071.lua +++ b/rush/c160211071.lua @@ -37,7 +37,7 @@ function s.drop(e,tp,eg,ep,ev,re,r,rp) --Effect local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) local sg=Duel.GetMatchingGroup(Card.IsCanChangePositionRush,tp,LOCATION_MZONE,LOCATION_MZONE,nil) - if Duel.Draw(p,d,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(Card.IsType,tp,LOCATION_GRAVE,0,1,nil,TYPE_NORMAL) + if Duel.Draw(p,d,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(Card.IsType,tp,LOCATION_GRAVE,0,1,nil,TYPE_NORMAL) and #sg>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_POSCHANGE) local sc=Group.Select(sg,tp,1,1,nil) diff --git a/rush/c160212002.lua b/rush/c160212002.lua index b873302011..4a6d5215c5 100644 --- a/rush/c160212002.lua +++ b/rush/c160212002.lua @@ -1,5 +1,5 @@ --強欲で謙虚な壺 ---Pot of Duality +--Pot of Duality (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160212003.lua b/rush/c160212003.lua index e3d127defe..7666702d55 100644 --- a/rush/c160212003.lua +++ b/rush/c160212003.lua @@ -1,5 +1,5 @@ --氷帝メビウス ---Mobius the Frost Monarch +--Mobius the Frost Monarch (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160212004.lua b/rush/c160212004.lua index eb38c7e70d..8054b8cd5e 100644 --- a/rush/c160212004.lua +++ b/rush/c160212004.lua @@ -1,5 +1,5 @@ --古代の機械巨人 ---Ancient Gear Golem +--Ancient Gear Golem (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160212007.lua b/rush/c160212007.lua index 2ae1dd3c98..4c7734820c 100644 --- a/rush/c160212007.lua +++ b/rush/c160212007.lua @@ -1,5 +1,5 @@ --古代の機械獣 ---Ancient Gear Beast +--Ancient Gear Beast (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160212008.lua b/rush/c160212008.lua index 80bcfac075..086a073969 100644 --- a/rush/c160212008.lua +++ b/rush/c160212008.lua @@ -1,5 +1,5 @@ --古代の機械兵士 ---Ancient Gear Soldier +--Ancient Gear Soldier (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160212011.lua b/rush/c160212011.lua index c968f8d6f1..3dd91c8b20 100644 --- a/rush/c160212011.lua +++ b/rush/c160212011.lua @@ -17,7 +17,7 @@ end s.listed_names={160212014,160212013} function s.condition(e,tp,eg,ep,ev,re,r,rp) local g=Duel.GetMatchingGroup(Card.IsMonster,tp,LOCATION_GRAVE,0,nil) - return e:GetHandler():IsStatus(STATUS_SUMMON_TURN) and #g>0 and not g:IsExists(aux.NOT(Card.IsRace),1,nil,RACE_MACHINE) + return e:GetHandler():IsStatus(STATUS_SUMMON_TURN) and #g>0 and not g:IsExists(aux.NOT(Card.IsRace),1,nil,RACE_MACHINE) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsPlayerCanDiscardDeck(tp,2) end diff --git a/rush/c160212012.lua b/rush/c160212012.lua index b50f8dd26b..65e2f24287 100644 --- a/rush/c160212012.lua +++ b/rush/c160212012.lua @@ -1,5 +1,5 @@ --古代の整備場 ---Ancient Gear Workshop +--Ancient Gear Workshop (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160212026.lua b/rush/c160212026.lua index e550ec2b3c..6d3453f7d2 100644 --- a/rush/c160212026.lua +++ b/rush/c160212026.lua @@ -1,5 +1,5 @@ --アトラクト・ゴーレム ---Attract Golem +--Attraction Golem --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160212041.lua b/rush/c160212041.lua index c8b18b304e..a89085512e 100644 --- a/rush/c160212041.lua +++ b/rush/c160212041.lua @@ -39,7 +39,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(500) c:RegisterEffect(e1) --Can make up to 2 attacks on monsters @@ -50,6 +50,6 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e2:SetRange(LOCATION_MZONE) e2:SetCode(EFFECT_EXTRA_ATTACK_MONSTER) e2:SetValue(1) - e2:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e2:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) c:RegisterEffect(e2) end diff --git a/rush/c160212043.lua b/rush/c160212043.lua index 1275f08870..40823e9667 100644 --- a/rush/c160212043.lua +++ b/rush/c160212043.lua @@ -49,7 +49,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) if #dg>0 then dg:AddMaximumCheck() Duel.HintSelection(dg) - if Duel.Destroy(dg,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) + if Duel.Destroy(dg,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_GRAVE,0,1,1,nil) diff --git a/rush/c160212044.lua b/rush/c160212044.lua index 0c91243913..a4400da864 100644 --- a/rush/c160212044.lua +++ b/rush/c160212044.lua @@ -32,7 +32,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) --Effect Duel.DiscardDeck(tp,3,REASON_EFFECT) if Duel.IsExistingMatchingCard(Card.IsLegend,tp,LOCATION_GRAVE,0,1,nil) - and Duel.IsExistingMatchingCard(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil) + and Duel.IsExistingMatchingCard(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATKDEF) local dg=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,1,1,nil) diff --git a/rush/c160212045.lua b/rush/c160212045.lua index b56bacdf64..ce110860a2 100644 --- a/rush/c160212045.lua +++ b/rush/c160212045.lua @@ -40,7 +40,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local g=Duel.SelectMatchingCard(tp,s.filter,tp,0,LOCATION_MZONE,1,2,nil) Duel.HintSelection(g) local g2=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.spfilter),tp,LOCATION_GRAVE,0,nil,e,tp) - if #g>0 and Duel.ChangePosition(g,POS_FACEUP_DEFENSE,POS_FACEDOWN_DEFENSE,POS_FACEUP_ATTACK,POS_FACEUP_ATTACK)>0 + if #g>0 and Duel.ChangePosition(g,POS_FACEUP_DEFENSE,POS_FACEDOWN_DEFENSE,POS_FACEUP_ATTACK,POS_FACEUP_ATTACK)>0 and #g2>0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and e:GetHandler():IsAttackPos() and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) local sg=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp) diff --git a/rush/c160212056.lua b/rush/c160212056.lua index 62c1ff49cb..a6ba4ea6ad 100644 --- a/rush/c160212056.lua +++ b/rush/c160212056.lua @@ -1,5 +1,5 @@ --ワイトキング ---King of the Skull Servants +--King of the Skull Servants (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160212057.lua b/rush/c160212057.lua index 08579cc38f..94551e4438 100644 --- a/rush/c160212057.lua +++ b/rush/c160212057.lua @@ -38,7 +38,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) if Duel.ChangePosition(e:GetHandler(),POS_FACEUP_DEFENSE,0,0,0)<1 then return end --Effect if Duel.DiscardDeck(tp,1,REASON_EFFECT)==0 then return end - if Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_GRAVE,0,1,nil,CARD_SKULL_SERVANT,36021814) + if Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_GRAVE,0,1,nil,CARD_SKULL_SERVANT,36021814) and Duel.IsPlayerCanDiscardDeck(tp,2) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.DiscardDeck(tp,2,REASON_EFFECT) end diff --git a/rush/c160212066.lua b/rush/c160212066.lua index 4ac0d3fe49..2bc6bcd69b 100644 --- a/rush/c160212066.lua +++ b/rush/c160212066.lua @@ -1,5 +1,5 @@ --ガーディアン・オブ・オーダー ---Guardian of Order +--Guardian of Order (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160212069.lua b/rush/c160212069.lua index 462fa013c6..896fdcbc05 100644 --- a/rush/c160212069.lua +++ b/rush/c160212069.lua @@ -1,5 +1,5 @@ --ＲＡＭクラウダー ---RAM Clouder +--RAM Clouder (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160212075.lua b/rush/c160212075.lua index 649fb0ccd4..5d5fc19c11 100644 --- a/rush/c160212075.lua +++ b/rush/c160212075.lua @@ -1,4 +1,5 @@ --ハリケーン +--Giant Trunade (Rush) local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160212080.lua b/rush/c160212080.lua index 272e23819c..7447d75644 100644 --- a/rush/c160212080.lua +++ b/rush/c160212080.lua @@ -1,5 +1,5 @@ --硫酸のたまった落とし穴 ---Acid Trap Hole +--Acid Trap Hole (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160213022.lua b/rush/c160213022.lua index 7c4352c986..444c042ebb 100644 --- a/rush/c160213022.lua +++ b/rush/c160213022.lua @@ -33,7 +33,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local g=Duel.SelectMatchingCard(tp,s.cfilter,tp,LOCATION_HAND,0,1,1,nil) if Duel.SendtoGrave(g,REASON_COST)<1 then return end --Effect - if Duel.DiscardDeck(tp,2,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) + if Duel.DiscardDeck(tp,2,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_GRAVE,0,1,1,nil) diff --git a/rush/c160213028.lua b/rush/c160213028.lua index 221de78657..9236ad81ca 100644 --- a/rush/c160213028.lua +++ b/rush/c160213028.lua @@ -14,7 +14,7 @@ function s.initial_effect(c) c:RegisterEffect(e1) end function s.cfilter(c) - return c:IsMonster() and c:IsAbleToDeckOrExtraAsCost() + return c:IsMonster() and c:IsAbleToDeckOrExtraAsCost() end function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_GRAVE,0,2,nil) end diff --git a/rush/c160213030.lua b/rush/c160213030.lua index 2aa68e6ff9..427b8feaff 100644 --- a/rush/c160213030.lua +++ b/rush/c160213030.lua @@ -20,7 +20,7 @@ end function s.condition(e,tp,eg,ep,ev,re,r,rp) if #eg~=1 then return false end local tc=eg:GetFirst() - return tc:IsFaceup() and tc:IsType(TYPE_EFFECT) and tc:IsCanTurnSet() and tc:IsCanChangePositionRush() + return tc:IsFaceup() and tc:IsType(TYPE_EFFECT) and tc:IsCanTurnSet() and tc:IsCanChangePositionRush() and tc:IsSummonPlayer(1-tp) and Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/rush/c160213032.lua b/rush/c160213032.lua index cfa3843a11..8e14f4c116 100644 --- a/rush/c160213032.lua +++ b/rush/c160213032.lua @@ -1,3 +1,3 @@ --大恐竜駕ダイナーミクス ---Great Imperial Dinocarriage Dynarmix +--Dynamic Dino Dynamix Duel.LoadCardScriptAlias(160203006) diff --git a/rush/c160213037.lua b/rush/c160213037.lua index 36d67da49f..fb04bda964 100644 --- a/rush/c160213037.lua +++ b/rush/c160213037.lua @@ -1,4 +1,5 @@ --ブラキオレイドス +--Bracchio-raidus (Rush) local s,id=GetID() function s.initial_effect(c) --fusion material diff --git a/rush/c160213041.lua b/rush/c160213041.lua index 3ae7d8e4c6..74208cab82 100644 --- a/rush/c160213041.lua +++ b/rush/c160213041.lua @@ -1,5 +1,5 @@ --抑竜コアトルステルン ---Suppressaurus Coatlustern +--Supressaurus Coatlustern --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160213049.lua b/rush/c160213049.lua index ec0b3677ca..081db52462 100644 --- a/rush/c160213049.lua +++ b/rush/c160213049.lua @@ -39,7 +39,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local sg=dg:Select(tp,1,1,nil) sg=sg:AddMaximumCheck() Duel.HintSelection(sg) - if Duel.Destroy(sg,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_MZONE,0,1,nil) + if Duel.Destroy(sg,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_MZONE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.BreakEffect() Duel.Damage(1-tp,1000,REASON_EFFECT) diff --git a/rush/c160213052.lua b/rush/c160213052.lua index cb2e26e919..18b9f1b80d 100644 --- a/rush/c160213052.lua +++ b/rush/c160213052.lua @@ -1,5 +1,5 @@ --現夢中のシルビクス ---Oneirophrenia Delirium Sylvix +--Oneirophrenia Delirium Silbyx --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -47,7 +47,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetReset(RESET_EVENT|RESETS_STANDARD_DISABLE|RESET_PHASE|PHASE_END) e1:SetValue(500) c:RegisterEffect(e1) - if Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsAbleToDeck),tp,0,LOCATION_ONFIELD,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then + if Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsAbleToDeck),tp,0,LOCATION_ONFIELD,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK) local g=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(Card.IsAbleToDeck),tp,0,LOCATION_ONFIELD,1,1,nil) if #g>0 then diff --git a/rush/c160213053.lua b/rush/c160213053.lua index 9d0adef6d5..ad94487f55 100644 --- a/rush/c160213053.lua +++ b/rush/c160213053.lua @@ -1,5 +1,5 @@ --栄華夢中のシルビクス ---Fleeting Delirium Sylvix +--Fleeting Delirium Silbyx --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160213055.lua b/rush/c160213055.lua index 919587d562..625973560c 100644 --- a/rush/c160213055.lua +++ b/rush/c160213055.lua @@ -1,5 +1,5 @@ --夢中のシルビクス ---Delirium Sylvix +--Delirium Silbyx --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160213058.lua b/rush/c160213058.lua index 9f5a49e888..b1316b604c 100644 --- a/rush/c160213058.lua +++ b/rush/c160213058.lua @@ -40,7 +40,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) if #g>0 then Duel.HintSelection(g) if Duel.ChangePosition(g,POS_FACEUP_DEFENSE,POS_FACEDOWN_DEFENSE,POS_FACEUP_ATTACK,POS_FACEUP_ATTACK)>0 - and Duel.IsExistingMatchingCard(s.insectfilter,tp,0,LOCATION_MZONE,1,nil) + and Duel.IsExistingMatchingCard(s.insectfilter,tp,0,LOCATION_MZONE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_APPLYTO) local dg=Duel.SelectMatchingCard(tp,s.insectfilter,tp,0,LOCATION_MZONE,1,1,nil) diff --git a/rush/c160213059.lua b/rush/c160213059.lua index 71c020daa9..fac3b53d8f 100644 --- a/rush/c160213059.lua +++ b/rush/c160213059.lua @@ -37,7 +37,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) if Duel.ChangePosition(c,POS_FACEUP_DEFENSE,0,0,0)<1 then return end --Effect if Duel.DiscardDeck(tp,2,REASON_EFFECT)>0 - and Duel.IsExistingMatchingCard(s.insectfilter,tp,0,LOCATION_MZONE,1,nil) + and Duel.IsExistingMatchingCard(s.insectfilter,tp,0,LOCATION_MZONE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_APPLYTO) local dg=Duel.SelectMatchingCard(tp,s.insectfilter,tp,0,LOCATION_MZONE,1,1,nil) diff --git a/rush/c160213062.lua b/rush/c160213062.lua index 2de816a758..12fe8a3f5b 100644 --- a/rush/c160213062.lua +++ b/rush/c160213062.lua @@ -1,5 +1,5 @@ --代打バッター ---Pinch Hopper +--Pinch Hopper (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160213068.lua b/rush/c160213068.lua index 95ce6f0d89..e3c3b759cc 100644 --- a/rush/c160213068.lua +++ b/rush/c160213068.lua @@ -1,5 +1,5 @@ --ライヤー・ワイヤー ---Lair Wire +--Lair Wire (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -34,7 +34,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) if Duel.SendtoDeck(td,nil,SEQ_DECKBOTTOM,REASON_COST)<1 then return end --Effect local tc=eg:GetFirst() - if tc then + if tc then Duel.Destroy(tc,REASON_EFFECT) end end diff --git a/rush/c160213078.lua b/rush/c160213078.lua index 313e7db5c4..074cd0dddc 100644 --- a/rush/c160213078.lua +++ b/rush/c160213078.lua @@ -1,5 +1,5 @@ --超伝導恐獣 ---Super Conductor Tyranno +--Super Conductor Tyranno (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160213082.lua b/rush/c160213082.lua index e2f5c09af3..6de5ba5931 100644 --- a/rush/c160213082.lua +++ b/rush/c160213082.lua @@ -1,5 +1,5 @@ --ライトニング・ボルテックス ---Lightning Vortex +--Lightning Vortex (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160213084.lua b/rush/c160213084.lua index e670d30f05..9b0cae6247 100644 --- a/rush/c160213084.lua +++ b/rush/c160213084.lua @@ -1,5 +1,5 @@ --波紋のバリア －ウェーブ・フォース－ ---Drowning Mirror Force +--Drowning Mirror Force (Rush) local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160214002.lua b/rush/c160214002.lua index 4733db2a6d..6078700214 100644 --- a/rush/c160214002.lua +++ b/rush/c160214002.lua @@ -1,5 +1,5 @@ --超魔導剣士－ブラック・パラディン ---Dark Paladin +--Dark Paladin (Rush) --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160214010.lua b/rush/c160214010.lua index a8aa953340..2ac0c139d7 100644 --- a/rush/c160214010.lua +++ b/rush/c160214010.lua @@ -1,3 +1,3 @@ --エクスキューティー・ライディング！ ---Excutie Riding! +--Executie Riding! Duel.LoadCardScriptAlias(160014064) diff --git a/rush/c160214027.lua b/rush/c160214027.lua index 6ed9aabd98..9314ad5b29 100644 --- a/rush/c160214027.lua +++ b/rush/c160214027.lua @@ -25,7 +25,7 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToGraveAsCost,tp,LOCATION_ONFIELD|LOCATION_HAND,0,1,e:GetHandler()) end end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return Duel.GetFieldGroupCount(tp,0,LOCATION_HAND+LOCATION_ONFIELD)>0 end + if chk==0 then return Duel.GetFieldGroupCount(tp,0,LOCATION_HAND|LOCATION_ONFIELD)>0 end end function s.operation(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() @@ -34,14 +34,14 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.SelectMatchingCard(tp,Card.IsAbleToGraveAsCost,tp,LOCATION_ONFIELD|LOCATION_HAND,0,1,1,c):GetFirst() if Duel.SendtoGrave(tc,REASON_COST)==0 then return end --Effect - local ct=Duel.GetFieldGroupCount(tp,0,LOCATION_HAND+LOCATION_ONFIELD) + local ct=Duel.GetFieldGroupCount(tp,0,LOCATION_HAND|LOCATION_ONFIELD) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetReset(RESETS_STANDARD_PHASE_END) e1:SetValue(ct*300) c:RegisterEffect(e1) - if Duel.IsExistingMatchingCard(Card.IsType,tp,LOCATION_GRAVE,0,1,nil,TYPE_NORMAL) + if Duel.IsExistingMatchingCard(Card.IsType,tp,LOCATION_GRAVE,0,1,nil,TYPE_NORMAL) and Duel.IsExistingMatchingCard(nil,tp,0,LOCATION_ONFIELD,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) diff --git a/rush/c160214028.lua b/rush/c160214028.lua index 8d0f98985f..af6312f776 100644 --- a/rush/c160214028.lua +++ b/rush/c160214028.lua @@ -1,5 +1,5 @@ --超魔導騎士－ブラック・キャバルリー ---Dark Cavalry +--Dark Cavalry (Rush) --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -34,11 +34,8 @@ end function s.ffilter(c,fc,sumtype,tp) return c:IsRace(RACE_WARRIOR,scard,sumtype,tp) and c:IsDefense(2100) end -function s.filter(c) - return c:IsType(TYPE_SPELL|TYPE_TRAP) -end function s.val(e,c) - return Duel.GetMatchingGroupCount(s.filter,0,LOCATION_GRAVE,LOCATION_GRAVE,nil)*100 + return Duel.GetMatchingGroupCount(Card.IsSpellTrap,0,LOCATION_GRAVE,LOCATION_GRAVE,nil)*100 end function s.condition(e) return Duel.GetFieldGroupCount(e:GetHandlerPlayer(),LOCATION_HAND,0)>=1 diff --git a/rush/c160214030.lua b/rush/c160214030.lua index d6ecd8362c..6566353d5f 100644 --- a/rush/c160214030.lua +++ b/rush/c160214030.lua @@ -1,5 +1,5 @@ --古代の機械超巨人 ---Ancient Gear Megaton Golem +--Ancient Gear Megaton Golem (Rush) --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160214033.lua b/rush/c160214033.lua index bea758da77..426d2785bf 100644 --- a/rush/c160214033.lua +++ b/rush/c160214033.lua @@ -1,5 +1,5 @@ --エクスキューティー・プラウティ・Ｆ ---Excutie Prouty Frontiere +--Executie Prouty Frontiere --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160214037.lua b/rush/c160214037.lua index 07203c5386..f78231200a 100644 --- a/rush/c160214037.lua +++ b/rush/c160214037.lua @@ -47,7 +47,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(atk*400) c:RegisterEffect(e1) end \ No newline at end of file diff --git a/rush/c160214038.lua b/rush/c160214038.lua index 5f25f0c9a7..5a535a78dc 100644 --- a/rush/c160214038.lua +++ b/rush/c160214038.lua @@ -1,5 +1,5 @@ --アルティメット・バースト ---Neutron Blast +--Neutron Blast (Rush) --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160214041.lua b/rush/c160214041.lua index 35b870873d..c6ecc5b833 100644 --- a/rush/c160214041.lua +++ b/rush/c160214041.lua @@ -27,7 +27,7 @@ function s.spfilter(c,e,tp) return c:IsRace(RACE_DRAGON) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) - if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 + if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp)end Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND) end diff --git a/rush/c160214042.lua b/rush/c160214042.lua index d6b58d31f3..a553a108eb 100644 --- a/rush/c160214042.lua +++ b/rush/c160214042.lua @@ -27,7 +27,7 @@ function s.thfilter(c) end function s.operation(e,tp,eg,ep,ev,re,r,rp) --Effect - if Duel.DiscardDeck(tp,2,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) + if Duel.DiscardDeck(tp,2,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_GRAVE,0,1,1,nil) diff --git a/rush/c160214045.lua b/rush/c160214045.lua index bcb25684b0..47b854461c 100644 --- a/rush/c160214045.lua +++ b/rush/c160214045.lua @@ -32,8 +32,8 @@ end function s.operation(e,tp,eg,ep,ev,re,r,rp) --Effect if Duel.DiscardDeck(tp,2,REASON_EFFECT)~=2 then return end - if Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_GRAVE,0,3,nil) - and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) + if Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_GRAVE,0,3,nil) + and Duel.IsExistingMatchingCard(aux.NecroValleyFilter(s.thfilter),tp,LOCATION_GRAVE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_GRAVE,0,1,1,nil) diff --git a/rush/c160214048.lua b/rush/c160214048.lua index 55d309796a..80e241860e 100644 --- a/rush/c160214048.lua +++ b/rush/c160214048.lua @@ -1,5 +1,5 @@ --古代の機械猟犬 ---Ancient Gear Hunting Hound +--Ancient Gear Hunting Hound (Rush) --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160214052.lua b/rush/c160214052.lua index 2455d7fe52..d429c7faeb 100644 --- a/rush/c160214052.lua +++ b/rush/c160214052.lua @@ -1,8 +1,10 @@ --ハーピィの羽根帚 +--Harpie's Feather Duster (Rush) local s,id=GetID() function s.initial_effect(c) --Activate local e1=Effect.CreateEffect(c) + e1:SetDescription(aux.Stringid(id,0)) e1:SetCategory(CATEGORY_DESTROY) e1:SetType(EFFECT_TYPE_ACTIVATE) e1:SetCode(EVENT_FREE_CHAIN) @@ -10,16 +12,13 @@ function s.initial_effect(c) e1:SetOperation(s.activate) c:RegisterEffect(e1) end -function s.filter(c) - return c:IsType(TYPE_SPELL+TYPE_TRAP) -end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) local c=e:GetHandler() - if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,0,LOCATION_ONFIELD,1,c) end - local sg=Duel.GetMatchingGroup(s.filter,tp,0,LOCATION_ONFIELD,c) + if chk==0 then return Duel.IsExistingMatchingCard(Card.IsSpellTrap,tp,0,LOCATION_ONFIELD,1,c) end + local sg=Duel.GetMatchingGroup(Card.IsSpellTrap,tp,0,LOCATION_ONFIELD,c) Duel.SetOperationInfo(0,CATEGORY_DESTROY,sg,#sg,0,0) end function s.activate(e,tp,eg,ep,ev,re,r,rp) - local sg=Duel.GetMatchingGroup(s.filter,tp,0,LOCATION_ONFIELD,e:GetHandler()) + local sg=Duel.GetMatchingGroup(Card.IsSpellTrap,tp,0,LOCATION_ONFIELD,e:GetHandler()) Duel.Destroy(sg,REASON_EFFECT) end diff --git a/rush/c160301001.lua b/rush/c160301001.lua index 4c7c8bb955..b3be0f0a04 100644 --- a/rush/c160301001.lua +++ b/rush/c160301001.lua @@ -31,7 +31,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(att*300) c:RegisterEffect(e1) end diff --git a/rush/c160301002.lua b/rush/c160301002.lua index c0906bc5d2..a2cba0bde0 100644 --- a/rush/c160301002.lua +++ b/rush/c160301002.lua @@ -1,5 +1,5 @@ --風使いトルネ ---Windcaster Torna +--Torna the Windweaver local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160301013.lua b/rush/c160301013.lua index acd460387d..af5e1ec944 100644 --- a/rush/c160301013.lua +++ b/rush/c160301013.lua @@ -1,5 +1,5 @@ --ダーク・リベレイション ---Dark Liberation +--Dark Revelation local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160302001.lua b/rush/c160302001.lua index abb8ac4d20..65aecade9c 100644 --- a/rush/c160302001.lua +++ b/rush/c160302001.lua @@ -1,5 +1,5 @@ --連撃竜ドラギアス ---Rush Dragon Dragears +--Multistrike Dragon Dragias local s,id=GetID() function s.initial_effect(c) --Attack @@ -30,12 +30,12 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) --effect local c=e:GetHandler() if c:IsFaceup() and c:IsRelateToEffect(e) then - c:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END,0,0) + c:RegisterFlagEffect(id,RESETS_STANDARD_DISABLE_PHASE_END,0,0) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_EXTRA_ATTACK) e1:SetCondition(s.macon) - e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_BATTLE) + e1:SetReset(RESET_EVENT|RESETS_STANDARD|RESET_PHASE|PHASE_BATTLE) e1:SetValue(1) c:RegisterEffect(e1) local e2=Effect.CreateEffect(c) diff --git a/rush/c160302006.lua b/rush/c160302006.lua index 523efe8bde..f1c25c4567 100644 --- a/rush/c160302006.lua +++ b/rush/c160302006.lua @@ -1,5 +1,5 @@ --ツインエッジ・ドラゴン ---Twin-Edge Dragon +--Twin Edge Dragon local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160302012.lua b/rush/c160302012.lua index 7604725c7f..a9d2dcc001 100644 --- a/rush/c160302012.lua +++ b/rush/c160302012.lua @@ -1,5 +1,5 @@ --火竜の熱閃 ---Fire Dragon's Heatflash +--Dragon's Inferno local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160302014.lua b/rush/c160302014.lua index 801c4ae27f..e352854451 100644 --- a/rush/c160302014.lua +++ b/rush/c160302014.lua @@ -1,5 +1,5 @@ --反攻の竜撃 ---Counteroffensive Dragonstrike +--Vengeful Dragon's Counterattack local s,id=GetID() function s.initial_effect(c) --Destroy 1 monster diff --git a/rush/c160303032.lua b/rush/c160303032.lua index ab9fb7e63f..00a4cc83e1 100644 --- a/rush/c160303032.lua +++ b/rush/c160303032.lua @@ -31,7 +31,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(e:GetHandler()) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UNRELEASABLE_SUM) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(1) g:GetFirst():RegisterEffect(e1,true) end diff --git a/rush/c160304003.lua b/rush/c160304003.lua index 09416e49e1..f7793e8b0a 100644 --- a/rush/c160304003.lua +++ b/rush/c160304003.lua @@ -1,5 +1,5 @@ --ドラゴンズ・ロック・クローザー ---Dragon’s Lock Closer +--Sportsdragon Closer local s,id=GetID() function s.initial_effect(c) --Increase ATK by 2000 diff --git a/rush/c160304023.lua b/rush/c160304023.lua index 78f6cce666..70f01ad513 100644 --- a/rush/c160304023.lua +++ b/rush/c160304023.lua @@ -1,5 +1,5 @@ -- ドラゴンズ・コネクション --- Dragon's Connection +--Sportsdragon Connection -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) @@ -19,8 +19,8 @@ function s.spfilter(c,e,tp) end function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 - and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,nil,e,tp) end - Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND+LOCATION_GRAVE) + and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND|LOCATION_GRAVE,0,1,nil,e,tp) end + Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND|LOCATION_GRAVE) end function s.thfilter(c) return c:IsCode(160002020,160002019) and c:IsAbleToHand() @@ -28,10 +28,10 @@ end function s.spop(e,tp,eg,ep,ev,re,r,rp) if Duel.GetLocationCount(tp,LOCATION_MZONE)<1 then return end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) - local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,e,tp) + local g=Duel.SelectMatchingCard(tp,s.spfilter,tp,LOCATION_HAND|LOCATION_GRAVE,0,1,1,nil,e,tp) if #g>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)>0 and Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsCode,160002001),tp,LOCATION_ONFIELD,0,1,nil) - and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_GRAVE,0,1,nil) + and Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_GRAVE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND) local hg=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_GRAVE,0,1,1,nil) diff --git a/rush/c160305006.lua b/rush/c160305006.lua index 14f2e611ba..9e3de08263 100644 --- a/rush/c160305006.lua +++ b/rush/c160305006.lua @@ -1,4 +1,4 @@ --- 魔将分隊 待組 +-- 魔将分隊 待組 -- Matsugumi the Ruler's Squad local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160305027.lua b/rush/c160305027.lua index 3a68f97388..693c85f5ce 100644 --- a/rush/c160305027.lua +++ b/rush/c160305027.lua @@ -1,5 +1,5 @@ --- オジギルド --- Bowing of the Graying Gauze Guild +-- オジギルド +--Bowing Brotherhood local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160305030.lua b/rush/c160305030.lua index 603cc7d5f3..8284fd5532 100644 --- a/rush/c160305030.lua +++ b/rush/c160305030.lua @@ -1,5 +1,5 @@ ---魔将方円舞 ---Fiendish Commander Dance +--魔将方円舞 +--Ruler's Dance local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160306003.lua b/rush/c160306003.lua index d4cc284ba0..15a9cd2a82 100644 --- a/rush/c160306003.lua +++ b/rush/c160306003.lua @@ -31,7 +31,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(atk*400) c:RegisterEffect(e1) end diff --git a/rush/c160306012.lua b/rush/c160306012.lua index aa862da9f0..085f9e1fae 100644 --- a/rush/c160306012.lua +++ b/rush/c160306012.lua @@ -1,5 +1,5 @@ -- ドリームラマー --- Dreamrummer +--Dream Drummer --Substitute ID local s,id=GetID() diff --git a/rush/c160306026.lua b/rush/c160306026.lua index aa642bef66..0d4b5c7da1 100644 --- a/rush/c160306026.lua +++ b/rush/c160306026.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) c:RegisterEffect(e1) end function s.cfilter(c) - return c:IsFaceup() and c:IsRace(RACE_PSYCHIC) + return c:IsFaceup() and c:IsRace(RACE_PSYCHIC) end function s.condition(e,tp,eg,ep,ev,re,r,rp) return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,2,nil) diff --git a/rush/c160307002.lua b/rush/c160307002.lua index 395c23ed96..0abf37c920 100644 --- a/rush/c160307002.lua +++ b/rush/c160307002.lua @@ -1,5 +1,5 @@ --星戦騎アスボロス ---Absolus the Star Knight +--Asbolus the Star Knight --Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160307026.lua b/rush/c160307026.lua index e43ffe4a9e..8d87f717f2 100644 --- a/rush/c160307026.lua +++ b/rush/c160307026.lua @@ -1,5 +1,5 @@ -- キングス・ライト --- King’s Right +--King's Right local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160308004.lua b/rush/c160308004.lua index fc424a77c3..32d42831db 100644 --- a/rush/c160308004.lua +++ b/rush/c160308004.lua @@ -1,5 +1,5 @@ -- シグルステート・ソル --- Sigilstate Sol +--Sigurstate Sol -- Scripted by Hatter local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160308005.lua b/rush/c160308005.lua index b4b457e3bd..67e16f1f51 100644 --- a/rush/c160308005.lua +++ b/rush/c160308005.lua @@ -1,5 +1,5 @@ --ベルセクタクル・マニ ---Berceptacle Mani +--Belsectacle Mani local s,id=GetID() function s.initial_effect(c) --ATK increase @@ -39,7 +39,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(atk*-300) tc:RegisterEffect(e1) end diff --git a/rush/c160308015.lua b/rush/c160308015.lua index 6a3278c660..74b6493e6b 100644 --- a/rush/c160308015.lua +++ b/rush/c160308015.lua @@ -1,4 +1,4 @@ ---粒子加速 +--粒子加速 --Particle Acceleration local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160309010.lua b/rush/c160309010.lua index d1d677c770..7c9c6a5322 100644 --- a/rush/c160309010.lua +++ b/rush/c160309010.lua @@ -1,5 +1,5 @@ --幻刃闘士ミキサ ---Constructor Brawler Mixah +--Constructor Fighter Mixer local s,id=GetID() function s.initial_effect(c) --ATK increase diff --git a/rush/c160309017.lua b/rush/c160309017.lua index f16970ffe6..4c78812a9c 100644 --- a/rush/c160309017.lua +++ b/rush/c160309017.lua @@ -1,5 +1,5 @@ ---幻刃工兵ドラフタンニム ---Draftannium the Mythic Sword Engineer +--幻刃工兵ドラフタンニム +--Constructor Engineer Draftannium local s,id=GetID() function s.initial_effect(c) --check top of deck diff --git a/rush/c160309027.lua b/rush/c160309027.lua index 6a01e48179..df0b07faad 100644 --- a/rush/c160309027.lua +++ b/rush/c160309027.lua @@ -1,5 +1,5 @@ --透幻郷の万緑 ---Verdant Vegetation of Spectral Shangri-La +--Vegetation of Blisstopia local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160311004.lua b/rush/c160311004.lua index 977448c5ef..15188fbdb4 100644 --- a/rush/c160311004.lua +++ b/rush/c160311004.lua @@ -43,6 +43,6 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CANNOT_ATTACK) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(function(_,c) return not c:IsRace(RACE_GALAXY) end) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end \ No newline at end of file diff --git a/rush/c160311017.lua b/rush/c160311017.lua index a5d509eadd..165b265f9d 100644 --- a/rush/c160311017.lua +++ b/rush/c160311017.lua @@ -1,5 +1,5 @@ --トランザム・クライネ ---Transamu Klein +--Transam Kleine local s,id=GetID() function s.initial_effect(c) --Draw and send 1 card from hand to GY @@ -37,6 +37,6 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CANNOT_ATTACK) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(function(_,c) return not c:IsRace(RACE_GALAXY) end) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end \ No newline at end of file diff --git a/rush/c160311025.lua b/rush/c160311025.lua index 69610acfc4..ba75a914fd 100644 --- a/rush/c160311025.lua +++ b/rush/c160311025.lua @@ -1,5 +1,5 @@ --ユニヴァーストーム ---Universtorm +--Universal Storm local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160311028.lua b/rush/c160311028.lua index 402f356c70..99c7219177 100644 --- a/rush/c160311028.lua +++ b/rush/c160311028.lua @@ -1,5 +1,5 @@ --トランザム・アライブ ---Transamu Arrive +--Transam Alive local s,id=GetID() function s.initial_effect(c) --Special Summon 1 Galaxy Normal Monster from the GY @@ -25,13 +25,13 @@ function s.filter(c,e,tp) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 - and Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_GRAVE+LOCATION_HAND,0,1,nil,e,tp) end - Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE+LOCATION_HAND) + and Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_GRAVE|LOCATION_HAND,0,1,nil,e,tp) end + Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE|LOCATION_HAND) end function s.operation(e,tp,eg,ep,ev,re,r,rp) if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) - local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.filter),tp,LOCATION_GRAVE+LOCATION_HAND,0,1,1,nil,e,tp) + local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.filter),tp,LOCATION_GRAVE|LOCATION_HAND,0,1,1,nil,e,tp) if #g>0 then Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP_ATTACK) end diff --git a/rush/c160313006.lua b/rush/c160313006.lua index d78f0c59f7..9e20a19fb8 100644 --- a/rush/c160313006.lua +++ b/rush/c160313006.lua @@ -1,5 +1,5 @@ --コスモ・オーロライザ ---Cosmo Auroriser +--Cosmo Aurorizer --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -37,7 +37,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(atk*500) c:RegisterEffect(e1) end diff --git a/rush/c160313011.lua b/rush/c160313011.lua index a601bb8075..d338f18f6f 100644 --- a/rush/c160313011.lua +++ b/rush/c160313011.lua @@ -1,5 +1,5 @@ --トランザム・ジェライ ---Transamu Jerai +--Transam Jelai --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160313024.lua b/rush/c160313024.lua index 7d7835004c..f828b13a21 100644 --- a/rush/c160313024.lua +++ b/rush/c160313024.lua @@ -33,6 +33,6 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) if #dg>0 then dg=dg:AddMaximumCheck() Duel.HintSelection(dg,true) - Duel.SendtoHand(dg,nil,REASON_EFFECT) + Duel.SendtoHand(dg,nil,REASON_EFFECT) end end diff --git a/rush/c160314010.lua b/rush/c160314010.lua index 2165984fc0..1541f7b064 100644 --- a/rush/c160314010.lua +++ b/rush/c160314010.lua @@ -1,5 +1,5 @@ --タライチュラ ---Pantula +--Tapanchula --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160314021.lua b/rush/c160314021.lua index fd54d1f5ce..97b451c24d 100644 --- a/rush/c160314021.lua +++ b/rush/c160314021.lua @@ -28,7 +28,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local g=Duel.GetOperatedGroup() local ct=g:GetFirst() --If it was a monster, reduce ATK - if ct and ct:IsMonster() and ct:IsLocation(LOCATION_GRAVE) and Duel.IsExistingMatchingCard(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil) + if ct and ct:IsMonster() and ct:IsLocation(LOCATION_GRAVE) and Duel.IsExistingMatchingCard(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP) local dg=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,1,1,nil) diff --git a/rush/c160315001.lua b/rush/c160315001.lua index 2981aaa918..ac2f9b1093 100644 --- a/rush/c160315001.lua +++ b/rush/c160315001.lua @@ -38,7 +38,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) e1:SetValue(val) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) c:RegisterEffect(e1) Duel.SendtoDeck(g,nil,SEQ_DECKSHUFFLE,REASON_EFFECT) end diff --git a/rush/c160315029.lua b/rush/c160315029.lua index 034a47f91c..5946edd6fa 100644 --- a/rush/c160315029.lua +++ b/rush/c160315029.lua @@ -1,5 +1,5 @@ --竜超天山 ---Dragon Surpassing the Heavenly Heights +--Dragon's Peak --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160315032.lua b/rush/c160315032.lua index 0bdd164165..fdf3df9adb 100644 --- a/rush/c160315032.lua +++ b/rush/c160315032.lua @@ -1,5 +1,5 @@ --ＲＢドラフォン ---RB Draphone +--RB Dragophone --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160316017.lua b/rush/c160316017.lua index 2a86de422c..d9e3e3f776 100644 --- a/rush/c160316017.lua +++ b/rush/c160316017.lua @@ -1,5 +1,5 @@ --ランプの炎魔メチル ---Methyl the Flame Jinn of the Lamp +--Methyl the Fire Genie of the Lamp local s,id=GetID() function s.initial_effect(c) --Add 1 level 4 Pyro monster to the hand @@ -39,6 +39,6 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CANNOT_ATTACK) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(function(_,c) return not c:IsRace(RACE_PYRO) end) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end \ No newline at end of file diff --git a/rush/c160316018.lua b/rush/c160316018.lua index 543cc1d040..c8d97ed884 100644 --- a/rush/c160316018.lua +++ b/rush/c160316018.lua @@ -1,5 +1,5 @@ --ランプの炎魔エチル ---Ethyl the Flame Jinn of the Lamp +--Ethyl the Fire Genie of the Lamp local s,id=GetID() function s.initial_effect(c) -- Special Summon diff --git a/rush/c160316028.lua b/rush/c160316028.lua index 1661882b05..15da877ee6 100644 --- a/rush/c160316028.lua +++ b/rush/c160316028.lua @@ -1,5 +1,5 @@ --炎の天秤 ---Scales of Flame +--Scale of Flame --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160317001.lua b/rush/c160317001.lua index dd59e0fa2d..08d36f57b8 100644 --- a/rush/c160317001.lua +++ b/rush/c160317001.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・エリジウム ---Voidvelgr Elysium +--Voidvelg Elysium --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160317007.lua b/rush/c160317007.lua index 32a3b55e53..c5ac2eda5a 100644 --- a/rush/c160317007.lua +++ b/rush/c160317007.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・ヘカトンケイル ---Voidvelgr Hecatoncheir +--Voidvelg Hecatoncheir --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160317015.lua b/rush/c160317015.lua index 08799f1dbe..318b2385a1 100644 --- a/rush/c160317015.lua +++ b/rush/c160317015.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・グロビュール ---Voidvelgr Globule +--Voidvelg Globule --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160317018.lua b/rush/c160317018.lua index 38e4e3cc7a..00a783dfe9 100644 --- a/rush/c160317018.lua +++ b/rush/c160317018.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・メテオン ---Voidvelgr Meteon +--Voidvelg Meteon --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160317019.lua b/rush/c160317019.lua index 289c235ff7..61144d8033 100644 --- a/rush/c160317019.lua +++ b/rush/c160317019.lua @@ -1,5 +1,5 @@ -- Meteorlarva --- メテオラーヴァ +--Meteorlarva local s,id=GetID() function s.initial_effect(c) -- Mill diff --git a/rush/c160319035.lua b/rush/c160319035.lua index 79f8879337..604a5ee75c 100644 --- a/rush/c160319035.lua +++ b/rush/c160319035.lua @@ -17,7 +17,7 @@ function s.initial_effect(c) end s.listed_names={CARD_BLUEEYES_W_DRAGON} function s.cfilter(c,tp) - return c:GetReasonPlayer()==1-tp and c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousControler(tp) + return c:GetReasonPlayer()==1-tp and c:IsPreviousLocation(LOCATION_MZONE) and c:IsPreviousControler(tp) and (c:IsReason(REASON_EFFECT) or (c:IsReason(REASON_BATTLE) and Duel.GetAttacker():IsControler(1-tp))) end function s.condition(e,tp,eg,ep,ev,re,r,rp) @@ -35,8 +35,8 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.filter),tp,LOCATION_GRAVE,0,1,1,nil,e,tp) - if #g>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)>0 - and Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsCode,CARD_BLUEEYES_W_DRAGON),tp,LOCATION_MZONE,0,1,nil) + if #g>0 and Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)>0 + and Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsCode,CARD_BLUEEYES_W_DRAGON),tp,LOCATION_MZONE,0,1,nil) and Duel.IsExistingMatchingCard(nil,tp,0,LOCATION_ONFIELD,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) diff --git a/rush/c160320001.lua b/rush/c160320001.lua index b0c4ff0f3d..122702d95d 100644 --- a/rush/c160320001.lua +++ b/rush/c160320001.lua @@ -1,5 +1,5 @@ --Ｅ・ＨＥＲＯ フレイム・ウィングマン ---Elemental HERO Flame Wingman +--Elemental HERO Flame Wingman (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160320003.lua b/rush/c160320003.lua index d04dce3da3..dacaf659a9 100644 --- a/rush/c160320003.lua +++ b/rush/c160320003.lua @@ -1,5 +1,5 @@ --Ｅ・ＨＥＲＯ サンダー・ジャイアント ---Elemental HERO Thunder Giant +--Elemental HERO Thunder Giant (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160320009.lua b/rush/c160320009.lua index 970589f4b8..c0529aabf8 100644 --- a/rush/c160320009.lua +++ b/rush/c160320009.lua @@ -1,5 +1,5 @@ --Ｅ・ＨＥＲＯ バブルマン ---Elemental HERO Bubbleman +--Elemental HERO Bubbleman (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -15,7 +15,7 @@ function s.initial_effect(c) c:RegisterEffect(e1) end function s.condition(e,tp,eg,ep,ev,re,r,rp) - return Duel.GetFieldGroupCount(tp,LOCATION_ONFIELD|LOCATION_HAND,0)==1 + return Duel.GetFieldGroupCount(tp,LOCATION_ONFIELD|LOCATION_HAND,0)==1 and e:GetHandler():IsStatus(STATUS_SUMMON_TURN|STATUS_SPSUMMON_TURN) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/rush/c160320014.lua b/rush/c160320014.lua index 83d4c65ab6..06d9f5899b 100644 --- a/rush/c160320014.lua +++ b/rush/c160320014.lua @@ -1,5 +1,5 @@ --放浪の勇者 フリード ---Freed the Brave Wanderer +--Freed the Brave Wanderer (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160320031.lua b/rush/c160320031.lua index 7fd346c956..f694f2f48b 100644 --- a/rush/c160320031.lua +++ b/rush/c160320031.lua @@ -1,5 +1,5 @@ --ミラクル・フュージョン ---Miracle Fusion +--Miracle Fusion (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -17,7 +17,7 @@ function s.fextra(e,tp,mg) return Duel.GetMatchingGroup(s.mfilter,tp,LOCATION_GRAVE|LOCATION_MZONE,0,nil) end function s.extraop(e,tc,tp,sg) - local gg=sg:Filter(Card.IsLocation,nil,LOCATION_HAND+LOCATION_GRAVE) + local gg=sg:Filter(Card.IsLocation,nil,LOCATION_HAND|LOCATION_GRAVE) if #gg>0 then Duel.HintSelection(gg,true) end local rg=sg:Filter(Card.IsFacedown,nil) if #rg>0 then Duel.ConfirmCards(1-tp,rg) end diff --git a/rush/c160320032.lua b/rush/c160320032.lua index ae26c4f828..ff2357b881 100644 --- a/rush/c160320032.lua +++ b/rush/c160320032.lua @@ -1,5 +1,5 @@ --摩天楼 －スカイスクレイパー－ ---Skyscraper +--Skyscraper (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160320038.lua b/rush/c160320038.lua index d917952e29..5be6c23c38 100644 --- a/rush/c160320038.lua +++ b/rush/c160320038.lua @@ -1,5 +1,5 @@ --砂塵のバリア －ダスト・フォース－ ---Quaking Mirror Force +--Quaking Mirror Force (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160321001.lua b/rush/c160321001.lua index 43448c5ec4..890520b1fe 100644 --- a/rush/c160321001.lua +++ b/rush/c160321001.lua @@ -1,5 +1,5 @@ --キメラテック・オーバー・ドラゴン ---Chimeratech Overdragon +--Chimeratech Overdragon (Rush) local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetOperation(s.sucop) c:RegisterEffect(e1) end -s.material_setcode={0x93,0x1093} +s.material_setcode={SET_CYBER,SET_CYBER_DRAGON} function s.sucop(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() local e1=Effect.CreateEffect(c) diff --git a/rush/c160321006.lua b/rush/c160321006.lua index a7a31a3eb1..9cbc5e1417 100644 --- a/rush/c160321006.lua +++ b/rush/c160321006.lua @@ -41,7 +41,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetValue(CARD_CYBER_DRAGON) e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) - if Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,LOCATION_MZONE,0,1,nil) + if Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,LOCATION_MZONE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,2)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATKDEF) local tc=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,LOCATION_MZONE,0,1,1,nil):GetFirst() diff --git a/rush/c160321007.lua b/rush/c160321007.lua index 15985b546e..9ba51e7d84 100644 --- a/rush/c160321007.lua +++ b/rush/c160321007.lua @@ -1,5 +1,5 @@ --サイバー・ドラゴン・ツヴァイ ---Cyber Dragon Zwei +--Cyber Dragon Zwei (Rush) --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160321008.lua b/rush/c160321008.lua index 4c652d387d..a0ae17791e 100644 --- a/rush/c160321008.lua +++ b/rush/c160321008.lua @@ -1,5 +1,5 @@ --サイバー・ジラフ ---Cyber Kirin +--Cyber Kirin (Rush) --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -26,11 +26,11 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e1:SetTargetRange(1,0) e1:SetValue(s.damval) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) local e2=e1:Clone() e2:SetCode(EFFECT_NO_EFFECT_DAMAGE) - e2:SetReset(RESET_PHASE+PHASE_END) + e2:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e2,tp) end function s.damval(e,re,val,r,rp,rc) diff --git a/rush/c160321009.lua b/rush/c160321009.lua index ac03651230..97206eddf6 100644 --- a/rush/c160321009.lua +++ b/rush/c160321009.lua @@ -1,5 +1,5 @@ --サイバー・ドラゴン・ネクステア ---Cyber Dragon Nachster +--Cyber Dragon Nachster (Rush) --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160321037.lua b/rush/c160321037.lua index 4e52bd600d..3aef51a355 100644 --- a/rush/c160321037.lua +++ b/rush/c160321037.lua @@ -1,5 +1,5 @@ --サイバネティック・オーバーフロー ---Cybernetic Overflow +--Cybernetic Overflow (Rush) --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160322002.lua b/rush/c160322002.lua index 67a5189bb5..f79173d3d0 100644 --- a/rush/c160322002.lua +++ b/rush/c160322002.lua @@ -52,7 +52,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetValue(CARD_HARPIE_LADY) e1:SetReset(RESETS_STANDARD_PHASE_END) c:RegisterEffect(e1) - if c:IsStatus(STATUS_SPSUMMON_TURN) and Duel.IsExistingMatchingCard(Card.IsSpellTrap,tp,0,LOCATION_ONFIELD,1,nil) + if c:IsStatus(STATUS_SPSUMMON_TURN) and Duel.IsExistingMatchingCard(Card.IsSpellTrap,tp,0,LOCATION_ONFIELD,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) local dg=Duel.SelectMatchingCard(tp,Card.IsSpellTrap,tp,0,LOCATION_ONFIELD,1,1,nil) diff --git a/rush/c160322004.lua b/rush/c160322004.lua index 13c78b9aa3..5ecd00e98a 100644 --- a/rush/c160322004.lua +++ b/rush/c160322004.lua @@ -39,7 +39,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local g=Duel.SelectMatchingCard(tp,Card.IsCanChangePositionRush,tp,0,LOCATION_MZONE,1,1,nil) Duel.HintSelection(g) if Duel.ChangePosition(g,POS_FACEUP_DEFENSE,POS_FACEDOWN_DEFENSE,POS_FACEUP_ATTACK,POS_FACEUP_ATTACK)>0 - and Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_GRAVE,0,1,nil,160210070) + and Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_GRAVE,0,1,nil,160210070) and Duel.IsExistingMatchingCard(Card.IsDefensePos,tp,0,LOCATION_MZONE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY) diff --git a/rush/c160322005.lua b/rush/c160322005.lua index 5611006912..3d673d4528 100644 --- a/rush/c160322005.lua +++ b/rush/c160322005.lua @@ -40,7 +40,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) --Effect Duel.DiscardDeck(tp,3,REASON_EFFECT) if Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_GRAVE,0,1,nil) - and Duel.IsExistingMatchingCard(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil) + and Duel.IsExistingMatchingCard(Card.IsFaceup,tp,0,LOCATION_MZONE,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATKDEF) local dg=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(Card.IsFaceup),tp,0,LOCATION_MZONE,1,1,nil) diff --git a/rush/c160322035.lua b/rush/c160322035.lua index 67b2c2bed8..ca92e86a59 100644 --- a/rush/c160322035.lua +++ b/rush/c160322035.lua @@ -1,5 +1,5 @@ --ヒステリック・パーティー ---Hysteric Party +--Hysteric Party (Rush) --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -30,7 +30,7 @@ function s.condition2(e,tp,eg,ep,ev,re,r,rp) return ep==1-tp and Duel.IsTurnPlayer(1-tp) end function s.spfilter(c,e,tp) - return (c:IsCode(CARD_HARPIE_LADY,160208002) or (c:IsRace(RACE_WINGEDBEAST) and c:IsAttribute(ATTRIBUTE_WIND) and c:IsType(TYPE_FUSION))) + return (c:IsCode(CARD_HARPIE_LADY,160208002) or (c:IsRace(RACE_WINGEDBEAST) and c:IsAttribute(ATTRIBUTE_WIND) and c:IsType(TYPE_FUSION))) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/rush/c160323003.lua b/rush/c160323003.lua index c1bb64317f..e04a3d04ee 100644 --- a/rush/c160323003.lua +++ b/rush/c160323003.lua @@ -35,7 +35,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(1000) c:RegisterEffect(e1) local g=Duel.GetMatchingGroup(Card.IsFaceup,tp,LOCATION_MZONE,0,nil) diff --git a/rush/c160323010.lua b/rush/c160323010.lua index b9379d5dbb..ae3027c812 100644 --- a/rush/c160323010.lua +++ b/rush/c160323010.lua @@ -13,7 +13,7 @@ function s.initial_effect(c) e1:SetTarget(s.target) e1:SetOperation(s.operation) c:RegisterEffect(e1) -end +end function s.tdfilter(c,tp) return c:IsMonster() and c:IsAbleToDeckOrExtraAsCost() end diff --git a/rush/c160323029.lua b/rush/c160323029.lua index fefaed09e8..9d89dbc476 100644 --- a/rush/c160323029.lua +++ b/rush/c160323029.lua @@ -30,7 +30,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) Duel.HintSelection(g) if Duel.GetControl(tc,tp) then local e1=Effect.CreateEffect(c) - local reset=RESET_EVENT|RESETS_STANDARD-RESET_TURN_SET|RESET_PHASE|PHASE_END + local reset=RESETS_STANDARD_PHASE_END&~RESET_TURN_SET e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UNRELEASABLE_SUM) e1:SetReset(reset) diff --git a/rush/c160401001.lua b/rush/c160401001.lua index 719c83acd6..b8d04e353e 100644 --- a/rush/c160401001.lua +++ b/rush/c160401001.lua @@ -45,7 +45,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(400) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) c:RegisterEffect(e1) end end diff --git a/rush/c160401002.lua b/rush/c160401002.lua index 3880516e30..d52808cf48 100644 --- a/rush/c160401002.lua +++ b/rush/c160401002.lua @@ -1,3 +1,3 @@ --コズミックストリング・ヌードルイダス ---Cosmic String Noodle-Druidess +--Cosmic String Noodryad Duel.LoadCardScriptAlias(160202042) diff --git a/rush/c160401003.lua b/rush/c160401003.lua index 062778c122..ed89063d35 100644 --- a/rush/c160401003.lua +++ b/rush/c160401003.lua @@ -1,3 +1,3 @@ -- 幻刃竜ビルド・ドラゴン --- Build Dragon the Mythic Sword Dragon +--Constructor Wyrm Buildragon Duel.LoadCardScriptAlias(160004024) diff --git a/rush/c160401005.lua b/rush/c160401005.lua index 92f1254d2d..23093ed64b 100644 --- a/rush/c160401005.lua +++ b/rush/c160401005.lua @@ -1,3 +1,3 @@ -- 月魔将キメルーナ ---Kimeluna the Lunar Dark Decider +--Kimeluna the Dark Shifter Duel.LoadCardScriptAlias(160007017) diff --git a/rush/c160401014.lua b/rush/c160401014.lua index 85d91624c7..61f9d1b457 100644 --- a/rush/c160401014.lua +++ b/rush/c160401014.lua @@ -1,3 +1,3 @@ --エリート秘密捜査官ミステリー ---Elite Secret Investigator Mystery +--Elite Agent Mystery Duel.LoadCardScriptAlias(160014022) \ No newline at end of file diff --git a/rush/c160401017.lua b/rush/c160401017.lua index bcff2b1b67..3525599883 100644 --- a/rush/c160401017.lua +++ b/rush/c160401017.lua @@ -1,3 +1,3 @@ --トランザム・アサルトライナック ---Transamu Assault Rainac +--Transam Assault Linac Duel.LoadCardScriptAlias(160019035) \ No newline at end of file diff --git a/rush/c160402002.lua b/rush/c160402002.lua index 4a0412e6e8..77ac442b74 100644 --- a/rush/c160402002.lua +++ b/rush/c160402002.lua @@ -1,5 +1,5 @@ --ジャスティス・ドラゴン ---Justice Dragon +--Righteous Dragon local s,id=GetID() function s.initial_effect(c) --double tribute diff --git a/rush/c160402003.lua b/rush/c160402003.lua index b0916ed872..b9f86c73e2 100644 --- a/rush/c160402003.lua +++ b/rush/c160402003.lua @@ -1,5 +1,5 @@ --ロード・マジック－バックフロー ---Road Magic - Backflow +--Road Magic - Flowback --Scripted by Naim local s,id=GetID() function s.initial_effect(c) @@ -22,7 +22,7 @@ function s.thcond(e,tp,eg,ep,ev,re,r,rp) return Duel.IsExistingMatchingCard(s.cfilter,tp,LOCATION_MZONE,0,1,nil) end function s.costfilter(c,e,tp) - return c:IsMonster() and c:IsAttribute(ATTRIBUTE_WATER) and c:IsAbleToGraveAsCost() + return c:IsMonster() and c:IsAttribute(ATTRIBUTE_WATER) and c:IsAbleToGraveAsCost() end function s.thcost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(s.costfilter,tp,LOCATION_HAND,0,1,e:GetHandler()) end diff --git a/rush/c160402004.lua b/rush/c160402004.lua index 0025fb090b..6526dcf18c 100644 --- a/rush/c160402004.lua +++ b/rush/c160402004.lua @@ -1,5 +1,5 @@ --ロイヤルデモンズ・ブルース ---Royal Demon's Blues +--Royal Rebel's Blues local s,id=GetID() function s.initial_effect(c) @@ -50,7 +50,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_OATH) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.ftarget) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end end diff --git a/rush/c160402006.lua b/rush/c160402006.lua index 9c233011ad..b57c58f66b 100644 --- a/rush/c160402006.lua +++ b/rush/c160402006.lua @@ -1,5 +1,5 @@ --黄昏の勇者ライダクロス ---Brave of Twilight, Lydacross +--Raidacross, Hero of the Dusk local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160402009.lua b/rush/c160402009.lua index 7b54ddf0b6..8bb4d84751 100644 --- a/rush/c160402009.lua +++ b/rush/c160402009.lua @@ -1,4 +1,5 @@ --The☆Star Dragon +--The Star Dragon local s,id=GetID() function s.initial_effect(c) -- atk change diff --git a/rush/c160402011.lua b/rush/c160402011.lua index bfb36f027d..df964a22ac 100644 --- a/rush/c160402011.lua +++ b/rush/c160402011.lua @@ -1,5 +1,5 @@ -- 陰陽極士ドウマ --- Onmyou Supreme Sage Douma +--Douma the Talismanic Supreme Sage local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() @@ -33,7 +33,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(atkval) c:RegisterEffect(e1) end diff --git a/rush/c160402013.lua b/rush/c160402013.lua index f9728d61f4..f9e2bb8116 100644 --- a/rush/c160402013.lua +++ b/rush/c160402013.lua @@ -25,7 +25,7 @@ end function s.operation(e,tp,eg,ep,ev,re,r,rp) local c=e:GetHandler() --requirement - Duel.PayLPCost(tp,1000) + Duel.PayLPCost(tp,1000) --effect if c:IsRelateToEffect(e) and c:IsFaceup() then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP) diff --git a/rush/c160402016.lua b/rush/c160402016.lua index a20cfac387..839dc6a9fa 100644 --- a/rush/c160402016.lua +++ b/rush/c160402016.lua @@ -1,5 +1,5 @@ --ライステラス・セキュア ---Raistellas Secure +--Rice Terrace Secure --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160402018.lua b/rush/c160402018.lua index 6b3aa48198..a0ce639651 100644 --- a/rush/c160402018.lua +++ b/rush/c160402018.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・トランジ ---Voidvelgr Transi +--Voidvelg Transi --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160402024.lua b/rush/c160402024.lua index abad28c83c..495f797ae3 100644 --- a/rush/c160402024.lua +++ b/rush/c160402024.lua @@ -1,5 +1,5 @@ --トランザム・ライカー ---Transamu Raiker +--Transam Lika --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160402025.lua b/rush/c160402025.lua index 006ac6bc13..980be7cba2 100644 --- a/rush/c160402025.lua +++ b/rush/c160402025.lua @@ -1,5 +1,5 @@ --斬奏のプレクトクライム ---Prectcrime of the Deadly Dirge +--Plectcrime of the Deadly Dirge local s,id=GetID() function s.initial_effect(c) --Add 1 Equip Spell card to hand diff --git a/rush/c160402032.lua b/rush/c160402032.lua index e4ce1ab339..635f2ddf4a 100644 --- a/rush/c160402032.lua +++ b/rush/c160402032.lua @@ -40,8 +40,8 @@ function s.drop(e,tp,eg,ep,ev,re,r,rp) --Effect local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) Duel.Draw(p,d,REASON_EFFECT) - if Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_GRAVE,0,1,nil,CARD_STRAYNGE_CAT) - and Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_MZONE,0,1,nil) + if Duel.IsExistingMatchingCard(Card.IsCode,tp,LOCATION_GRAVE,0,1,nil,CARD_STRAYNGE_CAT) + and Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_MZONE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_APPLYTO) local g2=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_MZONE,0,1,1,nil) diff --git a/rush/c160402036.lua b/rush/c160402036.lua index e71ed3d09f..0ef657fb25 100644 --- a/rush/c160402036.lua +++ b/rush/c160402036.lua @@ -1,5 +1,5 @@ --トランザム・スクライド ---Transamu Scraied +--Transam Scride --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160402037.lua b/rush/c160402037.lua index 3b94b08ac5..00dc46a588 100644 --- a/rush/c160402037.lua +++ b/rush/c160402037.lua @@ -1,5 +1,5 @@ --ヴォイドヴェルグ・ゴッドレクイエム ---Voidvelgr God Requiem +--Voidvelg God Requiem --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160402039.lua b/rush/c160402039.lua index eca0541dab..dd679642c3 100644 --- a/rush/c160402039.lua +++ b/rush/c160402039.lua @@ -1,5 +1,5 @@ --魔導師の力 ---Mage Power +--Mage Power (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160402040.lua b/rush/c160402040.lua index 00319721fd..2e0468ea9f 100644 --- a/rush/c160402040.lua +++ b/rush/c160402040.lua @@ -1,5 +1,5 @@ --ものマネ幻想師 ---Copycat +--Copycat (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -25,7 +25,7 @@ function s.filter(c) if c:IsMaximumModeSide() then return false end local atk=c:GetBaseAttack() if c:IsMaximumMode() then atk=c:GetMaximumAttack() end - return c:IsFaceup() and atk>=100 + return c:IsFaceup() and atk>=100 end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,0,LOCATION_MZONE,1,nil) end diff --git a/rush/c160402042.lua b/rush/c160402042.lua index 8c0a296b68..ea8b450313 100644 --- a/rush/c160402042.lua +++ b/rush/c160402042.lua @@ -1,4 +1,5 @@ --E・HERO マッドボールマン +--Elemental HERO Mudballman (Rush) local s,id=GetID() function s.initial_effect(c) --fusion material @@ -6,4 +7,4 @@ function s.initial_effect(c) c:EnableReviveLimit() Fusion.AddProcMix(c,true,true,79979666,84327329) end -s.material_setcode={0x8,0x3008} \ No newline at end of file +s.material_setcode={SET_HERO,SET_ELEMENTAL_HERO} \ No newline at end of file diff --git a/rush/c160402044.lua b/rush/c160402044.lua index 90f2e9c308..ffd7201925 100644 --- a/rush/c160402044.lua +++ b/rush/c160402044.lua @@ -1,5 +1,5 @@ --カードガンナー ---Card Trooper +--Card Trooper (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) @@ -36,7 +36,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) end end local ct2=0 - if #ct==1 then + if #ct==1 then ct2=Duel.DiscardDeck(tp,ct[1],REASON_COST) else Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(id,2)) diff --git a/rush/c160402045.lua b/rush/c160402045.lua index 6a51a8aa82..d5facf9747 100644 --- a/rush/c160402045.lua +++ b/rush/c160402045.lua @@ -1,5 +1,5 @@ --ヘルフレイムエンペラー ---Infernal Flame Emperor +--Infernal Flame Emperor (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160402047.lua b/rush/c160402047.lua index 12811e0de0..9558621def 100644 --- a/rush/c160402047.lua +++ b/rush/c160402047.lua @@ -1,5 +1,5 @@ --トリプル・ヴァイパー ---Hydra Viper +--Hydra Viper (Rush) --Scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160402051.lua b/rush/c160402051.lua index 1171d9eb47..04c8285014 100644 --- a/rush/c160402051.lua +++ b/rush/c160402051.lua @@ -40,7 +40,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local dg=g:Select(tp,1,1,nil) local dg2=dg:AddMaximumCheck() Duel.HintSelection(dg2) - local ct=Duel.Destroy(dg,REASON_EFFECT) + local ct=Duel.Destroy(dg,REASON_EFFECT) local g2=Duel.GetMatchingGroup(aux.NecroValleyFilter(s.spfilter),tp,LOCATION_GRAVE,0,nil,e,tp) if ct>0 and #g2>0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) diff --git a/rush/c160403002.lua b/rush/c160403002.lua index e6e70405e3..a0a0aeeb5d 100644 --- a/rush/c160403002.lua +++ b/rush/c160403002.lua @@ -1,5 +1,5 @@ ---監獄の神 ディアン・ケト ---Dian Keto the Prison Master +--監獄の神 ディアン・ケト +--Dian Keto the Security Master local s,id=GetID() function s.initial_effect(c) --Gain LP diff --git a/rush/c160404003.lua b/rush/c160404003.lua index 0de9a1be4f..89f75690da 100644 --- a/rush/c160404003.lua +++ b/rush/c160404003.lua @@ -32,6 +32,6 @@ function s.damop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_OATH+EFFECT_FLAG_IGNORE_IMMUNE) e1:SetTarget(aux.TargetBoolFunction(Card.IsCode,CARD_REDEYES_B_DRAGON)) e1:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end diff --git a/rush/c160405002.lua b/rush/c160405002.lua index 7bb4881bde..cb0370d34e 100644 --- a/rush/c160405002.lua +++ b/rush/c160405002.lua @@ -1,5 +1,5 @@ --正統なるバーストブレス ---Traditional Burst Breath +--Burst Breath of Destruction local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160406004.lua b/rush/c160406004.lua index caa3751f73..aec5268893 100644 --- a/rush/c160406004.lua +++ b/rush/c160406004.lua @@ -1,5 +1,5 @@ --サイコな埋葬 ---Psycho Burial +--Psychic Burial local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160406005.lua b/rush/c160406005.lua index 284c9d5859..8219f130d8 100644 --- a/rush/c160406005.lua +++ b/rush/c160406005.lua @@ -1,5 +1,5 @@ --アキュア・ショット ---Acure Shot +--Cure Shot local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160407001.lua b/rush/c160407001.lua index d95a13d2ef..2962937a21 100644 --- a/rush/c160407001.lua +++ b/rush/c160407001.lua @@ -1,5 +1,5 @@ --あまびえさん ---Amabie-san (Rush) +--Amabie (Rush) local s,id=GetID() function s.initial_effect(c) --LP recover diff --git a/rush/c160409002.lua b/rush/c160409002.lua index 58673aa67e..74b87b9704 100644 --- a/rush/c160409002.lua +++ b/rush/c160409002.lua @@ -46,7 +46,7 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetValue(1500) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) rg:GetFirst():RegisterEffect(e1) end end \ No newline at end of file diff --git a/rush/c160409003.lua b/rush/c160409003.lua index d717267576..1798fc210b 100644 --- a/rush/c160409003.lua +++ b/rush/c160409003.lua @@ -65,7 +65,7 @@ function s.atkop(e,tp,eg,ep,ev,re,r,rp) e2:SetRange(LOCATION_MZONE) e2:SetCode(EFFECT_EXTRA_ATTACK_MONSTER) e2:SetValue(1) - e2:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e2:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) c:RegisterEffect(e2) end function s.destg(e,tp,eg,ep,ev,re,r,rp,chk) diff --git a/rush/c160410002.lua b/rush/c160410002.lua index 7e32bdca33..2bc862d0f0 100644 --- a/rush/c160410002.lua +++ b/rush/c160410002.lua @@ -1,3 +1,3 @@ --連撃竜ドラギアス ---Rush Dragon Dragears +--Multistrike Dragon Dragias Duel.LoadCardScriptAlias(160302001) diff --git a/rush/c160410004.lua b/rush/c160410004.lua index 8002695873..ceec0fe517 100644 --- a/rush/c160410004.lua +++ b/rush/c160410004.lua @@ -1,3 +1,3 @@ -- 幻撃竜ミラギアス ---Fantastrike Dragon Miragears +--Illusion Strike Dragon Miragias Duel.LoadCardScriptAlias(160003025) diff --git a/rush/c160411001.lua b/rush/c160411001.lua index dec1a27499..da0570e35b 100644 --- a/rush/c160411001.lua +++ b/rush/c160411001.lua @@ -1,5 +1,5 @@ -- 最強戦旗エースブレイカー ---Saikyo Battle Flag Ace Breaker +--Ultimate Flag Mech Ace Breaker --Substitute ID local s,id=GetID() diff --git a/rush/c160412001.lua b/rush/c160412001.lua index ad11b26d58..ab8a6a2768 100644 --- a/rush/c160412001.lua +++ b/rush/c160412001.lua @@ -1,5 +1,5 @@ --治療の神 ディアン・ケト ---Dian Keto the Cure Master +--Dian Keto the Cure Master (Rush) local s,id=GetID() function s.initial_effect(c) --recover diff --git a/rush/c160412002.lua b/rush/c160412002.lua index ee010b7e1f..5d76ca7970 100644 --- a/rush/c160412002.lua +++ b/rush/c160412002.lua @@ -1,5 +1,5 @@ --- 花牙鬼のユリ --- Flower Fang Oni Yuri +-- 花牙鬼のユリ +--Yuri the Shadow Flower Fiend local s,id=GetID() function s.initial_effect(c) --Gain LP diff --git a/rush/c160412004.lua b/rush/c160412004.lua index 51f19be109..4bf540b984 100644 --- a/rush/c160412004.lua +++ b/rush/c160412004.lua @@ -1,4 +1,4 @@ ---幻刃剣匠 +--幻刃剣匠 --Constructor Sword Foreman local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160412005.lua b/rush/c160412005.lua index 3905d33ef6..4b38c8077e 100644 --- a/rush/c160412005.lua +++ b/rush/c160412005.lua @@ -1,5 +1,5 @@ --進軍の喇叭 ---Trumpet to March +--Trumpet Charge local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160414001.lua b/rush/c160414001.lua index 44c32790cc..1a103dba5e 100644 --- a/rush/c160414001.lua +++ b/rush/c160414001.lua @@ -1,5 +1,5 @@ --- 最強旗獣サージバイコーン --- Saikyo Flag Beast Surge Bicorn +-- 最強旗獣サージバイコーン +--Ultimate Flag Beast Surge Bicorn local s,id=GetID() function s.initial_effect(c) --double tribute diff --git a/rush/c160415003.lua b/rush/c160415003.lua index 03d288f139..aa11e8f3c8 100644 --- a/rush/c160415003.lua +++ b/rush/c160415003.lua @@ -1,4 +1,4 @@ ---最強旗獣エイムイーグル +--最強旗獣エイムイーグル --Ultimate Flag Beast Aim Eagle local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160418002.lua b/rush/c160418002.lua index 09e223cb0a..1e5be53316 100644 --- a/rush/c160418002.lua +++ b/rush/c160418002.lua @@ -17,7 +17,7 @@ function s.cost(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsPlayerCanDiscardDeckAsCost(tp,1) end end function s.filter(c) - return c:IsFaceup() and c:IsRace(RACE_SPELLCASTER) and c:IsAbleToHand() and not c:IsLevel(3) + return c:IsFaceup() and c:IsRace(RACE_SPELLCASTER) and c:IsAbleToHand() and not c:IsLevel(3) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end diff --git a/rush/c160419001.lua b/rush/c160419001.lua index 9920af0085..6e36787e47 100644 --- a/rush/c160419001.lua +++ b/rush/c160419001.lua @@ -1,5 +1,5 @@ --炎の剣士 ---Flame Swordsman +--Flame Swordsman (Rush) local s,id=GetID() function s.initial_effect(c) --fusion material diff --git a/rush/c160421002.lua b/rush/c160421002.lua index 7e32bdca33..2bc862d0f0 100644 --- a/rush/c160421002.lua +++ b/rush/c160421002.lua @@ -1,3 +1,3 @@ --連撃竜ドラギアス ---Rush Dragon Dragears +--Multistrike Dragon Dragias Duel.LoadCardScriptAlias(160302001) diff --git a/rush/c160421003.lua b/rush/c160421003.lua index eaf6db50c0..38320fc6b7 100644 --- a/rush/c160421003.lua +++ b/rush/c160421003.lua @@ -1,3 +1,3 @@ --彩光のプリマギターナ ---Prima Guitarna of the Colorful Light +--Prima Guitarna the Shining Superstar Duel.LoadCardScriptAlias(CARD_PRIMA_GUITARNA) diff --git a/rush/c160421004.lua b/rush/c160421004.lua index a39086d7ef..3ab3e9e9ca 100644 --- a/rush/c160421004.lua +++ b/rush/c160421004.lua @@ -1,3 +1,3 @@ --ジャンク・ブレイカー ---Fiendish Commander Yameruler +--Yamiruler the Dark Delayer Duel.LoadCardScriptAlias(160001029) diff --git a/rush/c160421007.lua b/rush/c160421007.lua index 062778c122..ed89063d35 100644 --- a/rush/c160421007.lua +++ b/rush/c160421007.lua @@ -1,3 +1,3 @@ -- 幻刃竜ビルド・ドラゴン --- Build Dragon the Mythic Sword Dragon +--Constructor Wyrm Buildragon Duel.LoadCardScriptAlias(160004024) diff --git a/rush/c160421008.lua b/rush/c160421008.lua index d3aa13aba8..e5b61ba6f4 100644 --- a/rush/c160421008.lua +++ b/rush/c160421008.lua @@ -1,5 +1,5 @@ -- 最強戦旗ゴールドラッシュ --- Saikyo Battle Flag Gold Rush +--Ultimate Flag Mech Gold Rush local s,id=GetID() function s.initial_effect(c) --Add card to hand diff --git a/rush/c160421010.lua b/rush/c160421010.lua index 9aabc0b812..9e15e2c810 100644 --- a/rush/c160421010.lua +++ b/rush/c160421010.lua @@ -1,5 +1,5 @@ -- ＣＡＮ－Ｍｅｌｏ：Ｄ --- CAN-Melo:D +--CAN - Melo:D local s,id=GetID() function s.initial_effect(c) -- Shuffle an opponent's face-down card to the deck diff --git a/rush/c160421013.lua b/rush/c160421013.lua index 1d3a752fdd..1c22a45641 100644 --- a/rush/c160421013.lua +++ b/rush/c160421013.lua @@ -1,5 +1,5 @@ -- アトラシュート・ハイドロン --- Attolashoot Highdron +--Attrashoot Hydron local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160421014.lua b/rush/c160421014.lua index 7f15ec61a4..e1bf7f74a5 100644 --- a/rush/c160421014.lua +++ b/rush/c160421014.lua @@ -1,5 +1,5 @@ --夢幻刃龍ビルドリム ---Infinidream Constructor Wyrm Buildrim +--Infinite Constructor Wyrm Buildream local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() diff --git a/rush/c160421024.lua b/rush/c160421024.lua index 5c93f86f6d..04c93e62d7 100644 --- a/rush/c160421024.lua +++ b/rush/c160421024.lua @@ -16,14 +16,14 @@ function s.filter(c,e,tp) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 - and Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_GRAVE+LOCATION_HAND,0,1,nil,e,tp) end - Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE+LOCATION_HAND) + and Duel.IsExistingMatchingCard(s.filter,tp,LOCATION_GRAVE|LOCATION_HAND,0,1,nil,e,tp) end + Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE|LOCATION_HAND) end function s.activate(e,tp,eg,ep,ev,re,r,rp) --Effect if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) - local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_GRAVE+LOCATION_HAND,0,1,1,nil,e,tp) + local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_GRAVE|LOCATION_HAND,0,1,1,nil,e,tp) if #g>0 then Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP) --Piercing @@ -32,7 +32,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(700) tc:RegisterEffect(e1) local e2=Effect.CreateEffect(e:GetHandler()) diff --git a/rush/c160421028.lua b/rush/c160421028.lua index a836971e51..1a924e1890 100644 --- a/rush/c160421028.lua +++ b/rush/c160421028.lua @@ -1,5 +1,5 @@ --滅びの爆裂疾風弾 ---Burst Stream of Destruction +--Burst Stream of Destruction (Rush) local s,id=GetID() function s.initial_effect(c) --Activate diff --git a/rush/c160421038.lua b/rush/c160421038.lua index 51b7511dc5..e4251ae4ef 100644 --- a/rush/c160421038.lua +++ b/rush/c160421038.lua @@ -1,5 +1,5 @@ -- 陰陽士カラタケ --- Onmyou Warrior Karatake +--Karatake the Talismanic Warrior local s,id=GetID() function s.initial_effect(c) --Pay LP to deal damage diff --git a/rush/c160421039.lua b/rush/c160421039.lua index 451df666a2..ab36fd4c2f 100644 --- a/rush/c160421039.lua +++ b/rush/c160421039.lua @@ -47,9 +47,9 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local sg=Duel.GetMatchingGroup(aux.FilterMaximumSideFunctionEx(s.filter),tp,0,LOCATION_MZONE,nil) if Duel.SendtoDeck(tg,nil,0,REASON_EFFECT) and #sg>0 and Duel.SelectYesNo(tp,aux.Stringid(id,1)) then local tg=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(s.filter),tp,0,LOCATION_MZONE,1,1,nil) - if #tg>0 then + if #tg>0 then tg=tg:AddMaximumCheck() - Duel.Destroy(tg,REASON_EFFECT) + Duel.Destroy(tg,REASON_EFFECT) end end end diff --git a/rush/c160421108.lua b/rush/c160421108.lua index 312374062a..96212be5bd 100644 --- a/rush/c160421108.lua +++ b/rush/c160421108.lua @@ -1,3 +1,3 @@ -- 最強戦旗ゴールドラッシュ --- Saikyo Battle Flag Gold Rush +--Ultimate Flag Mech Gold Rush Duel.LoadCardScriptAlias(160421008) diff --git a/rush/c160421110.lua b/rush/c160421110.lua index c8ab298e54..e736f3afd9 100644 --- a/rush/c160421110.lua +++ b/rush/c160421110.lua @@ -1,3 +1,3 @@ -- ＣＡＮ－Ｍｅｌｏ：Ｄ --- CAN-Melo:D +--CAN - Melo:D Duel.LoadCardScriptAlias(160421010) diff --git a/rush/c160421113.lua b/rush/c160421113.lua index ec07458264..b6291a64b7 100644 --- a/rush/c160421113.lua +++ b/rush/c160421113.lua @@ -1,3 +1,3 @@ -- アトラシュート・ハイドロン --- Attolashoot Highdron +--Attrashoot Hydron Duel.LoadCardScriptAlias(160421013) diff --git a/rush/c160421114.lua b/rush/c160421114.lua index 29521cf8bc..890041cae0 100644 --- a/rush/c160421114.lua +++ b/rush/c160421114.lua @@ -1,3 +1,3 @@ --夢幻刃龍ビルドリム ---Infinidream Constructor Wyrm Buildrim +--Infinite Constructor Wyrm Buildream Duel.LoadCardScriptAlias(160421014) diff --git a/rush/c160422001.lua b/rush/c160422001.lua index 0890ecc872..402dbb08db 100644 --- a/rush/c160422001.lua +++ b/rush/c160422001.lua @@ -38,7 +38,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) c:RegisterEffect(e1) --shuffle to deck local fid=c:GetFieldID() - c:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD,0,1,fid) + c:RegisterFlagEffect(id,RESET_EVENT|RESETS_STANDARD,0,1,fid) local e2=Effect.CreateEffect(c) e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS) e2:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) diff --git a/rush/c160423001.lua b/rush/c160423001.lua index 7d10dddaa2..47b0700ce4 100644 --- a/rush/c160423001.lua +++ b/rush/c160423001.lua @@ -1,5 +1,5 @@ -- ドラゴンに乗るワイバーン (Rush) --- Alligator’s Sword Dragon (Rush) +--Alligator's Sword Dragon (Rush) local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() diff --git a/rush/c160424002.lua b/rush/c160424002.lua index 8002695873..ceec0fe517 100644 --- a/rush/c160424002.lua +++ b/rush/c160424002.lua @@ -1,3 +1,3 @@ -- 幻撃竜ミラギアス ---Fantastrike Dragon Miragears +--Illusion Strike Dragon Miragias Duel.LoadCardScriptAlias(160003025) diff --git a/rush/c160427001.lua b/rush/c160427001.lua index e0a562f1ef..28c417b734 100644 --- a/rush/c160427001.lua +++ b/rush/c160427001.lua @@ -31,7 +31,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) e1:SetProperty(EFFECT_FLAG_COPY_INHERIT) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(att*200) c:RegisterEffect(e1) if Duel.GetLP(1-tp)<=700 then diff --git a/rush/c160428001.lua b/rush/c160428001.lua index f48df346ff..5ed2697896 100644 --- a/rush/c160428001.lua +++ b/rush/c160428001.lua @@ -1,5 +1,5 @@ --超魔輝獣マグナム・オーバーロード［Ｌ］ ---Supreme Beast Magnum Overlord [L] +--Supreme Wildgleam Magnum Overlord [L] local s,id=GetID() function s.initial_effect(c) local e1=Effect.CreateEffect(c) diff --git a/rush/c160428002.lua b/rush/c160428002.lua index eb2815ca46..7743a1bfe3 100644 --- a/rush/c160428002.lua +++ b/rush/c160428002.lua @@ -1,5 +1,5 @@ --超魔輝獣マグナム・オーバーロード ---Supreme Beast Magnum Overlord +--Supreme Wildgleam Magnum Overlord local s,id=GetID() function s.initial_effect(c) Maximum.AddProcedure(c,nil,s.filter1,s.filter2) diff --git a/rush/c160428003.lua b/rush/c160428003.lua index d926ea0e7f..12dfaab1c7 100644 --- a/rush/c160428003.lua +++ b/rush/c160428003.lua @@ -1,5 +1,5 @@ --超魔輝獣マグナム・オーバーロード［Ｒ］ ---Supreme Beast Magnum Overlord [R] +--Supreme Wildgleam Magnum Overlord [R] local s,id=GetID() function s.initial_effect(c) -- cannot attack diff --git a/rush/c160428004.lua b/rush/c160428004.lua index 81a9a66df5..888e103fe5 100644 --- a/rush/c160428004.lua +++ b/rush/c160428004.lua @@ -1,5 +1,5 @@ --剛撃龍メタギアスターＦ ---Strong Strike Dragon Metagiastar F +--Sturdy Strike Dragon Metagiastar F local s,id=GetID() function s.initial_effect(c) --fusion material diff --git a/rush/c160428007.lua b/rush/c160428007.lua index cc69e69e20..d818c39fd8 100644 --- a/rush/c160428007.lua +++ b/rush/c160428007.lua @@ -34,7 +34,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CANNOT_ATTACK) e1:SetTargetRange(LOCATION_MZONE,0) e1:SetTarget(s.atktg) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end function s.atktg(e,c) diff --git a/rush/c160428019.lua b/rush/c160428019.lua index 3ee6151833..90e7160185 100644 --- a/rush/c160428019.lua +++ b/rush/c160428019.lua @@ -1,5 +1,5 @@ --ロード・マジック－ダークナイト ---Road Magic - Dark Night +--Road Magic - Dark Twilight --Scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160428020.lua b/rush/c160428020.lua index 0b4f0a1f74..04eebe974c 100644 --- a/rush/c160428020.lua +++ b/rush/c160428020.lua @@ -1,5 +1,5 @@ --ダークネス・ロード ---Darkness Road +--Darkness Lode --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160428024.lua b/rush/c160428024.lua index 686b2e07da..3bd0e23a54 100644 --- a/rush/c160428024.lua +++ b/rush/c160428024.lua @@ -1,5 +1,5 @@ --彩光超オメガギターナ ---Omega Guitarna the Supreme Shining Superstar +--Omega Guitarna the Shining Megastar local s,id=GetID() function s.initial_effect(c) --Fusion Material diff --git a/rush/c160428025.lua b/rush/c160428025.lua index 2b4b9552f9..f784166161 100644 --- a/rush/c160428025.lua +++ b/rush/c160428025.lua @@ -1,5 +1,5 @@ --彩光超プリンセスオメガ ---Princess Omega the Supreme Shining Superstar +--Princess Omega the Shining Megastar local s,id=GetID() function s.initial_effect(c) --Fusion Material diff --git a/rush/c160428037.lua b/rush/c160428037.lua index c52e7df905..8f076f8590 100644 --- a/rush/c160428037.lua +++ b/rush/c160428037.lua @@ -1,5 +1,5 @@ --ＡＩくまキャン ---A.I. Bear Can +--Ice Pop Bear --scripted by Naim local s,id=GetID() function s.initial_effect(c) @@ -41,6 +41,6 @@ function s.spop(e,tp,eg,ep,ev,re,r,rp) e2:SetCode(EFFECT_CANNOT_ATTACK) e2:SetTargetRange(LOCATION_MZONE,0) e2:SetTarget(function(_,c) return not (c:IsRace(RACE_PSYCHIC) or c:IsRace(RACE_OMEGAPSYCHIC)) end) - e2:SetReset(RESET_PHASE+PHASE_END) + e2:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e2,tp) end \ No newline at end of file diff --git a/rush/c160428044.lua b/rush/c160428044.lua index 593cf039e3..89c1fd66a4 100644 --- a/rush/c160428044.lua +++ b/rush/c160428044.lua @@ -42,7 +42,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) local sg=tc:Select(tp,1,1,nil) Duel.HintSelection(sg,true) if Duel.Destroy(sg,REASON_EFFECT)>0 then res=sg:GetFirst():GetTextAttack() end - else --otherwise, directly destroy it + else --otherwise, directly destroy it if Duel.Destroy(tc,REASON_EFFECT)>0 then res=tc:GetFirst():GetTextAttack() end end if res and Duel.IsExistingMatchingCard(aux.FaceupFilter(Card.IsRace,RACE_OMEGAPSYCHIC),tp,LOCATION_MZONE,0,1,nil) then diff --git a/rush/c160428048.lua b/rush/c160428048.lua index 32a2545bb6..3befa53903 100644 --- a/rush/c160428048.lua +++ b/rush/c160428048.lua @@ -29,7 +29,7 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk) Duel.SetPossibleOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_GRAVE) end function s.thfilter(c) - return c:IsLevelBelow(3) and c:IsAbleToHand() + return c:IsLevelBelow(3) and c:IsAbleToHand() end function s.operation(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetAttacker() diff --git a/rush/c160428052.lua b/rush/c160428052.lua index f38cceae00..67ac8d6940 100644 --- a/rush/c160428052.lua +++ b/rush/c160428052.lua @@ -1,5 +1,5 @@ --厨房の神 ディアン・ケト ---Dian Keto the Kitchen Master +--Dian Keto the Cooking Master local s,id=GetID() function s.initial_effect(c) --Send the top 3 cards of your Deck to the GY diff --git a/rush/c160428065.lua b/rush/c160428065.lua index a650f10df5..b053b971df 100644 --- a/rush/c160428065.lua +++ b/rush/c160428065.lua @@ -1,5 +1,5 @@ --バブリーマン・ショック！ ---Bubblyman Shock! +--Bubbleburst Shock! --scripted by pyrQ local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160428067.lua b/rush/c160428067.lua index 1c495ab22e..1963dd57ee 100644 --- a/rush/c160428067.lua +++ b/rush/c160428067.lua @@ -1,5 +1,5 @@ --アゲアゲイン ---Excitagain +--Party Up --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160428068.lua b/rush/c160428068.lua index d233264a21..793be87b0f 100644 --- a/rush/c160428068.lua +++ b/rush/c160428068.lua @@ -19,7 +19,7 @@ function s.filter1(c,tp) return c:IsSummonPlayer(1-tp) and c:IsLevelAbove(7) and c:IsFaceup() end function s.condition(e,tp,eg,ep,ev,re,r,rp) - return eg:IsExists(s.filter1,1,nil,tp) + return eg:IsExists(s.filter1,1,nil,tp) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return true end @@ -30,7 +30,7 @@ end function s.activate(e,tp,eg,ep,ev,re,r,rp) --Effect local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM) - if Duel.Recover(p,d,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.filter2),tp,LOCATION_MZONE,0,1,nil) + if Duel.Recover(p,d,REASON_EFFECT)>0 and Duel.IsExistingMatchingCard(aux.FilterMaximumSideFunctionEx(s.filter2),tp,LOCATION_MZONE,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then local tc2=Duel.SelectMatchingCard(tp,aux.FilterMaximumSideFunctionEx(s.filter2),tp,LOCATION_MZONE,0,1,1,nil):GetFirst() if tc2 then @@ -46,5 +46,5 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) end end function s.filter2(c) - return c:IsRace(RACE_AQUA) and c:IsFaceup() + return c:IsRace(RACE_AQUA) and c:IsFaceup() end diff --git a/rush/c160428071.lua b/rush/c160428071.lua index e8a699f173..aa8d12da80 100644 --- a/rush/c160428071.lua +++ b/rush/c160428071.lua @@ -1,5 +1,5 @@ --冥骸デッド・ルーラー ---Dark Skeleton Dead Ruler +--Dark Doom Dread Ruler --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160428073.lua b/rush/c160428073.lua index 6c4e1c5e78..992a732a6e 100644 --- a/rush/c160428073.lua +++ b/rush/c160428073.lua @@ -1,5 +1,5 @@ --這いずり回る半身 ---The Half-Body Crawling Around +--Crawling Torso --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160428074.lua b/rush/c160428074.lua index d5e97111d3..674068a1b9 100644 --- a/rush/c160428074.lua +++ b/rush/c160428074.lua @@ -1,5 +1,5 @@ --デビル・フランケン・シュライン ---Cyber-Stein Shrine +--Cyber-Stein Frankenshrine --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160428079.lua b/rush/c160428079.lua index 3ae2a6293f..9eec9e201a 100644 --- a/rush/c160428079.lua +++ b/rush/c160428079.lua @@ -39,6 +39,6 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e1:SetCode(EFFECT_CANNOT_ATTACK_ANNOUNCE) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_OATH) e1:SetTargetRange(1,0) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end \ No newline at end of file diff --git a/rush/c160428082.lua b/rush/c160428082.lua index 0890f8be11..ae25423e2d 100644 --- a/rush/c160428082.lua +++ b/rush/c160428082.lua @@ -37,7 +37,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e0:SetProperty(EFFECT_FLAG_OATH) e0:SetTargetRange(LOCATION_MZONE,0) e0:SetTarget(function(e,c) return not c:IsRace(RACE_ZOMBIE) end) - e0:SetReset(RESET_PHASE+PHASE_END) + e0:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e0,tp) --Requirement Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_CONFIRM) diff --git a/rush/c160428083.lua b/rush/c160428083.lua index 64bcf6556e..ce06f4b9e5 100644 --- a/rush/c160428083.lua +++ b/rush/c160428083.lua @@ -1,5 +1,5 @@ --ビックリ・ゾンビクトリー ---Surprising Zombie Victory +--Surprising Zomvictory --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160428084.lua b/rush/c160428084.lua index 33712b0b89..78fcd5aaa3 100644 --- a/rush/c160428084.lua +++ b/rush/c160428084.lua @@ -1,5 +1,5 @@ --オマエの後ろだ！ ---Behind You! +--It's Right Behind You! --scripted by Naim local s,id=GetID() function s.initial_effect(c) @@ -22,13 +22,13 @@ function s.spfilter(c,e,tp) end function s.sptg(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0 - and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,nil,e,tp) end - Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,LOCATION_HAND+LOCATION_GRAVE) + and Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND|LOCATION_GRAVE,0,1,nil,e,tp) end + Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,0,LOCATION_HAND|LOCATION_GRAVE) end function s.spop(e,tp,eg,ep,ev,re,r,rp) if Duel.GetLocationCount(tp,LOCATION_MZONE)==0 then return end Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON) - local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.spfilter),tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,e,tp) + local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(s.spfilter),tp,LOCATION_HAND|LOCATION_GRAVE,0,1,1,nil,e,tp) if #g>0 then local tc=g:GetFirst() if Duel.SpecialSummon(tc,0,tp,tp,false,false,POS_FACEUP)>0 then diff --git a/rush/c160428085.lua b/rush/c160428085.lua index ad8cf0d7bb..09da9533a3 100644 --- a/rush/c160428085.lua +++ b/rush/c160428085.lua @@ -1,5 +1,5 @@ --ひたひたと迫る足音 ---Gradually Approaching Footsteps +--I Hear Footsteps --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160428086.lua b/rush/c160428086.lua index 3e8200bf11..da39904ab7 100644 --- a/rush/c160428086.lua +++ b/rush/c160428086.lua @@ -17,7 +17,7 @@ function s.zfilter(c) end function s.condition(e,tp,eg,ep,ev,re,r,rp) local tc=Duel.GetAttacker() - return tc:IsControler(1-tp) and tc:IsLevelBelow(9) and Duel.IsExistingMatchingCard(s.zfilter,tp,LOCATION_MZONE,0,1,nil) + return tc:IsControler(1-tp) and tc:IsLevelBelow(9) and Duel.IsExistingMatchingCard(s.zfilter,tp,LOCATION_MZONE,0,1,nil) end function s.target(e,tp,eg,ep,ev,re,r,rp,chk) if chk==0 then return true end diff --git a/rush/c160428087.lua b/rush/c160428087.lua index 501ef629d6..44f89df553 100644 --- a/rush/c160428087.lua +++ b/rush/c160428087.lua @@ -1,5 +1,5 @@ --呪いの着信番号 ---Terror Phone Number +--Terrorphone Number --scripted by Naim local s,id=GetID() function s.initial_effect(c) @@ -34,7 +34,7 @@ function s.damop(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE) e1:SetValue(s.atklimit) e1:SetTargetRange(0,LOCATION_MZONE) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end function s.atklimit(e,c) diff --git a/rush/c160428092.lua b/rush/c160428092.lua index f622ca2b7d..86aabbc0c8 100644 --- a/rush/c160428092.lua +++ b/rush/c160428092.lua @@ -1,5 +1,5 @@ --天終の怪依 ---The Strange Specter of Celestial Severance +--Specter of Heaven's End --scripted by Naim local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160428096.lua b/rush/c160428096.lua index 8e7ab09f3a..d7653d720c 100644 --- a/rush/c160428096.lua +++ b/rush/c160428096.lua @@ -1,5 +1,5 @@ -- トレード・イン --- Trade-in (Rush) +--Trade-In (Rush) local s,id=GetID() function s.initial_effect(c) -- Draw diff --git a/rush/c160428098.lua b/rush/c160428098.lua index 04b1004a72..bddb8c2e40 100644 --- a/rush/c160428098.lua +++ b/rush/c160428098.lua @@ -29,7 +29,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) if Duel.Damage(p,d,REASON_EFFECT)==0 then return end if Duel.GetMatchingGroupCountRush(s.cfilter,tp,0,LOCATION_MZONE,nil)>=2 and Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,0,LOCATION_MZONE,1,nil) - and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then + and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TODECK) local g=Duel.SelectMatchingCard(tp,Card.IsAbleToDeck,tp,0,LOCATION_MZONE,1,1,nil) if #g>0 then diff --git a/rush/c160431004.lua b/rush/c160431004.lua index 9195f58f6b..f24927900f 100644 --- a/rush/c160431004.lua +++ b/rush/c160431004.lua @@ -1,3 +1,3 @@ --碧牙の爆速竜 ---Blue-Tooth Burst Dragon +--Blue-Fang Burst Dragon Duel.LoadCardScriptAlias(CARD_BLUETOOTH_B_DRAGON) diff --git a/rush/c160431005.lua b/rush/c160431005.lua index 5782d1bf04..da604b290d 100644 --- a/rush/c160431005.lua +++ b/rush/c160431005.lua @@ -1,3 +1,3 @@ --ケミカライズ・サラマンダー ---Chemicalize Salamander +--Chemicalized Salamander Duel.LoadCardScriptAlias(160010020) diff --git a/rush/c160431006.lua b/rush/c160431006.lua index b727e2d2a3..bd696df04c 100644 --- a/rush/c160431006.lua +++ b/rush/c160431006.lua @@ -1,3 +1,3 @@ --ヴォイドヴェルグ・レクイエム ---Voidvelgr Requiem +--Voidvelg Requiem Duel.LoadCardScriptAlias(160010025) diff --git a/rush/c160432001.lua b/rush/c160432001.lua index ef67ebec52..ddac367672 100644 --- a/rush/c160432001.lua +++ b/rush/c160432001.lua @@ -28,7 +28,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) local e1=Effect.CreateEffect(c) e1:SetType(EFFECT_TYPE_SINGLE) e1:SetCode(EFFECT_UPDATE_ATTACK) - e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e1:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) e1:SetValue(500) c:RegisterEffect(e1) if not Duel.IsExistingMatchingCard(Card.IsSpellTrap,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) then @@ -39,7 +39,7 @@ function s.operation(e,tp,eg,ep,ev,re,r,rp) e2:SetRange(LOCATION_MZONE) e2:SetCode(EFFECT_EXTRA_ATTACK_MONSTER) e2:SetValue(1) - e2:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE+RESET_PHASE+PHASE_END) + e2:SetReset(RESETS_STANDARD_DISABLE_PHASE_END) c:RegisterEffect(e2) end end diff --git a/rush/c160432002.lua b/rush/c160432002.lua index 5d005d2345..29a85fe1fb 100644 --- a/rush/c160432002.lua +++ b/rush/c160432002.lua @@ -1,5 +1,5 @@ --マジシャンズ・ヴァルキリア ---Magician's Valkyria +--Magician's Valkyria (Rush) --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160432003.lua b/rush/c160432003.lua index 11508bc89e..5f3d6f88db 100644 --- a/rush/c160432003.lua +++ b/rush/c160432003.lua @@ -1,5 +1,5 @@ --大嵐 ---Heavy Storm +--Heavy Storm (Rush) --scripted by YoshiDuels local s,id=GetID() function s.initial_effect(c) diff --git a/rush/c160433001.lua b/rush/c160433001.lua index 644f2e823e..ea0e48f7fd 100644 --- a/rush/c160433001.lua +++ b/rush/c160433001.lua @@ -1,5 +1,5 @@ --竜騎士ガイア (Rush) ---Gaia he Dragon Champion (Rush) +--Gaia the Dragon Champion (Rush) local s,id=GetID() function s.initial_effect(c) c:EnableReviveLimit() diff --git a/rush/c160440005.lua b/rush/c160440005.lua index 73158d269c..0535cd58d5 100644 --- a/rush/c160440005.lua +++ b/rush/c160440005.lua @@ -1,3 +1,3 @@ --天終の怪依 ---The Strange Specter of Celestial Severance +--Specter of Heaven's End Duel.LoadCardScriptAlias(160428092) diff --git a/rush/c160443002.lua b/rush/c160443002.lua index 7e32bdca33..2bc862d0f0 100644 --- a/rush/c160443002.lua +++ b/rush/c160443002.lua @@ -1,3 +1,3 @@ --連撃竜ドラギアス ---Rush Dragon Dragears +--Multistrike Dragon Dragias Duel.LoadCardScriptAlias(160302001) diff --git a/rush/c160443003.lua b/rush/c160443003.lua index eaf6db50c0..38320fc6b7 100644 --- a/rush/c160443003.lua +++ b/rush/c160443003.lua @@ -1,3 +1,3 @@ --彩光のプリマギターナ ---Prima Guitarna of the Colorful Light +--Prima Guitarna the Shining Superstar Duel.LoadCardScriptAlias(CARD_PRIMA_GUITARNA) diff --git a/rush/c160443006.lua b/rush/c160443006.lua index 9195f58f6b..f24927900f 100644 --- a/rush/c160443006.lua +++ b/rush/c160443006.lua @@ -1,3 +1,3 @@ --碧牙の爆速竜 ---Blue-Tooth Burst Dragon +--Blue-Fang Burst Dragon Duel.LoadCardScriptAlias(CARD_BLUETOOTH_B_DRAGON) diff --git a/rush/c160445003.lua b/rush/c160445003.lua index 24bf9326c3..dae5895810 100644 --- a/rush/c160445003.lua +++ b/rush/c160445003.lua @@ -1,3 +1,3 @@ --竜騎士ガイア ---Gaia the Dragon Champion +--Gaia the Dragon Champion (Rush) Duel.LoadCardScriptAlias(160433001) diff --git a/rush/c160446001.lua b/rush/c160446001.lua index 3bc43cc86f..03a398da7f 100644 --- a/rush/c160446001.lua +++ b/rush/c160446001.lua @@ -1,4 +1,5 @@ --Thousand Dragon (Rush) +--Thousand Dragon (Rush) local s,id=GetID() function s.initial_effect(c) --fusion material diff --git a/rush/c160446012.lua b/rush/c160446012.lua index 7e32bdca33..2bc862d0f0 100644 --- a/rush/c160446012.lua +++ b/rush/c160446012.lua @@ -1,3 +1,3 @@ --連撃竜ドラギアス ---Rush Dragon Dragears +--Multistrike Dragon Dragias Duel.LoadCardScriptAlias(160302001) diff --git a/rush/c160446014.lua b/rush/c160446014.lua index 92f1254d2d..23093ed64b 100644 --- a/rush/c160446014.lua +++ b/rush/c160446014.lua @@ -1,3 +1,3 @@ -- 月魔将キメルーナ ---Kimeluna the Lunar Dark Decider +--Kimeluna the Dark Shifter Duel.LoadCardScriptAlias(160007017) diff --git a/rush/c160446015.lua b/rush/c160446015.lua index 085f0e3314..f2059925be 100644 --- a/rush/c160446015.lua +++ b/rush/c160446015.lua @@ -1,3 +1,3 @@ --ロイヤルデモンズ・パンク ---Royal Demon's Punk +--Royal Rebel's Rocker Duel.LoadCardScriptAlias(160201017) diff --git a/rush/c160446018.lua b/rush/c160446018.lua index 96eb680131..244cde063f 100644 --- a/rush/c160446018.lua +++ b/rush/c160446018.lua @@ -1,3 +1,3 @@ --真紅動の撃速竜 ---Red Boot Boost Dragon +--Red-Boot Boost Dragon Duel.LoadCardScriptAlias(160315001) diff --git a/rush/c160446020.lua b/rush/c160446020.lua index fe5e40a9ec..a7f729e8b8 100644 --- a/rush/c160446020.lua +++ b/rush/c160446020.lua @@ -1,3 +1,3 @@ --ヴォイドヴェルグ・トランジ ---Voidvelgr Transi +--Voidvelg Transi Duel.LoadCardScriptAlias(160402018) diff --git a/rush/c160448003.lua b/rush/c160448003.lua index 00957115b0..016b358de2 100644 --- a/rush/c160448003.lua +++ b/rush/c160448003.lua @@ -1,5 +1,5 @@ -- Progrigger Vancing --- プログリーガー・ヴァンセング +--Progrigger Vancing local s,id=GetID() function s.initial_effect(c) --special summon diff --git a/rush/c160449004.lua b/rush/c160449004.lua index 3916fb6f1c..61ce96f7a0 100644 --- a/rush/c160449004.lua +++ b/rush/c160449004.lua @@ -1,4 +1,5 @@ --カイザー・ドラゴン +--Kaiser Dragon (Rush) local s,id=GetID() function s.initial_effect(c) --fusion material diff --git a/rush/c160451005.lua b/rush/c160451005.lua index 5163030d8d..ca1a0e3673 100644 --- a/rush/c160451005.lua +++ b/rush/c160451005.lua @@ -49,7 +49,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp) e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET) e1:SetTargetRange(1,0) e1:SetValue(1) - e1:SetReset(RESET_PHASE+PHASE_END) + e1:SetReset(RESET_PHASE|PHASE_END) Duel.RegisterEffect(e1,tp) end end \ No newline at end of file diff --git a/rush/c160452014.lua b/rush/c160452014.lua index 097a2ee38d..6bdf5371ad 100644 --- a/rush/c160452014.lua +++ b/rush/c160452014.lua @@ -1,3 +1,3 @@ --ヴォイドヴェルグ・エリジウム ---Voidvelgr Elysium +--Voidvelg Elysium Duel.LoadCardScriptAlias(160317001) diff --git a/rush/c160453002.lua b/rush/c160453002.lua index a39086d7ef..3ab3e9e9ca 100644 --- a/rush/c160453002.lua +++ b/rush/c160453002.lua @@ -1,3 +1,3 @@ --ジャンク・ブレイカー ---Fiendish Commander Yameruler +--Yamiruler the Dark Delayer Duel.LoadCardScriptAlias(160001029) diff --git a/rush/c160453005.lua b/rush/c160453005.lua index b727e2d2a3..bd696df04c 100644 --- a/rush/c160453005.lua +++ b/rush/c160453005.lua @@ -1,3 +1,3 @@ --ヴォイドヴェルグ・レクイエム ---Voidvelgr Requiem +--Voidvelg Requiem Duel.LoadCardScriptAlias(160010025)