update card names used in Rush scripts

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

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

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

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

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()

rush/c160001043.lua

@@ -1,5 +1,5 @@
 --闇の訪れ
---Darkness Approaches (Rush Duel)
+--Darkness Approaches (Rush)
 
 local s,id=GetID()
 function s.initial_effect(c)

rush/c160001048.lua

@@ -1,5 +1,5 @@
 --突風
---Gust (Rush Duel)
+--Gust (Rush)
 
 local s,id=GetID()
 function s.initial_effect(c)

rush/c160001049.lua

@@ -1,5 +1,5 @@
 --暴虐の報い
---Brutal Retributtion
+--Brutal Retribution
 
 local s,id=GetID()
 function s.initial_effect(c)

rush/c160001050.lua

@@ -1,5 +1,5 @@
 --１アップ
---1 Up
+--1-Up
 
 local s,id=GetID()
 function s.initial_effect(c)

rush/c160002026.lua

@@ -1,5 +1,5 @@
 --闘将ナンデス
---Nanes the Fire Awakener
+--Nandes the Fire Awakener
 
 local s,id=GetID()
 function s.initial_effect(c)

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)

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)

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)

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

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)

rush/c160003022.lua

@@ -1,5 +1,5 @@
 --クリア・アイス・ドラゴン
---Clear Ice Dragon 
+--Clear Ice Dragon
 --Scripted by Hatter
 
 local s,id=GetID()

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

rush/c160003027.lua

@@ -1,5 +1,5 @@
 -- メッシーホース
---Festivi-Sea Horse
+--Seahorse Server
 local s,id=GetID()
 function s.initial_effect(c)
 	--Gain LP

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

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

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

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)

rush/c160003032.lua

@@ -1,5 +1,5 @@
--- 特報マシン・タフロイド 
--- News Flash Machine Toughroid
+-- 特報マシン・タフロイド
+--Printing Presser
 local s,id=GetID()
 function s.initial_effect(c)
 	--excavate

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

rush/c160003035.lua

@@ -1,4 +1,4 @@
---トリック・ピジョン 
+--トリック・ピジョン
 --Trick Pigeon
 local s,id=GetID()
 function s.initial_effect(c)

rush/c160003036.lua

@@ -1,4 +1,4 @@
---ルミナス・パロット 
+--ルミナス・パロット
 --Luminous Parrot
 
 local s,id=GetID()

rush/c160003037.lua

@@ -1,4 +1,4 @@
---ロング・シールド・ガードナー 
+--ロング・シールド・ガードナー
 --Long Shield Gardna
 local s,id=GetID()
 function s.initial_effect(c)

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

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

rush/c160003043.lua

@@ -1,5 +1,5 @@
 --リターン・オブ・ドラゴン
---Return of Dragon
+--Dragon's Return
 
 local s,id=GetID()
 function s.initial_effect(c)

rush/c160003044.lua

@@ -1,5 +1,5 @@
 --火中の栗
---Chestnuts Out of the Fire
+--Blazing Chestnut
 
 --Substitute ID
 local s,id=GetID()

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

rush/c160003048.lua

@@ -1,5 +1,5 @@
 -- 魅惑の不夜城
---The Enchanted Nightless City
+--Shining City Nights
 local s,id=GetID()
 function s.initial_effect(c)
 	--activate

rush/c160003050.lua

@@ -1,5 +1,5 @@
 --大海洋
---Big Ocean
+--Big Umi
 --Scripted by Naim
 local s,id=GetID()
 function s.initial_effect(c)

rush/c160003053.lua

@@ -1,4 +1,5 @@
 --森
+--Forest (Rush)
 local s,id=GetID()
 function s.initial_effect(c)
 	--Activate

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

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

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)

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

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)

rush/c160004018.lua

@@ -1,5 +1,5 @@
 --死反のタマ
---Soul of Death Reversal
+--Tama the Mancer Cat
 
 local s,id=GetID()
 function s.initial_effect(c)

rush/c160004019.lua

@@ -1,5 +1,5 @@
 --祭神モドリーナ
---Enshrined Deity Modorina
+--Modorina the Light Retriever
 
 local s,id=GetID()
 function s.initial_effect(c)