Merge branch 'master' of github.com:Fluorohydride/ygopro

script/c10028593.lua

---Reborn Tengu
+--݆h칷
 function c10028593.initial_effect(c)
 	--spsummon
 	local e1=Effect.CreateEffect(c)

script/c10365322.lua

@@ -28,16 +28,20 @@ function c10365322.destg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,0)
 end
 function c10365322.desop(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
-	local tc=g:GetFirst()
+	local tc=Duel.GetFirstTarget()
 	local c=e:GetHandler()
-	local dam=tc:IsRelateToEffect(e) and c:IsRelateToEffect(e)
-	local dg=Group.FromCards(c,tc)
-	Duel.Destroy(dg,REASON_EFFECT)
-	if dam and tc:IsLocation(LOCATION_GRAVE) and c:IsLocation(LOCATION_GRAVE) then
-		Duel.BreakEffect()
-		local d=tc:GetAttack()
-		if d<0 then d=0 end
-		Duel.Damage(1-tp,d,REASON_EFFECT)
+	if not tc:IsRelateToEffect(e) and not c:IsRelateToEffect(e) then return end
+	if not tc:IsRelateToEffect(e) then
+		Duel.Destroy(c,REASON_EFFECT)
+	elseif not c:IsRelateToEffect(e) then
+		Duel.Destroy(tc,REASON_EFFECT)
+	else
+		local dg=Group.FromCards(c,tc)
+		if Duel.Destroy(dg,REASON_EFFECT)==2 and tc:IsLocation(LOCATION_GRAVE) and c:IsLocation(LOCATION_GRAVE) then
+			Duel.BreakEffect()
+			local d=tc:GetAttack()
+			if d<0 then d=0 end
+			Duel.Damage(1-tp,d,REASON_EFFECT)
+		end
 	end
 end

script/c10802915.lua

---Tour Guide From the Underworld
+--魔界発現世行きデスガイド
 function c10802915.initial_effect(c)
 	--spsummon
 	local e2=Effect.CreateEffect(c)

script/c15667446.lua

---Latinum, Exarch of Dark World
+--\L 
 function c15667446.initial_effect(c)
 	--spsummon
 	local e1=Effect.CreateEffect(c)

script/c16480084.lua

---Evolsaur Pelta
+--`ڥ륿
 function c16480084.initial_effect(c)
 end
 function c16480084.evolreg(c)

script/c1828513.lua

---Shadow of the Six Samurai - Shien
+--\Ӱ
 function c1828513.initial_effect(c)
 	--xyz summon
 	aux.AddXyzProcedure(c,c1828513.xyzfilter,2)

script/c21507589.lua

---Fish and Swaps
+--フィッシュアンドバックス
 function c21507589.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)

script/c21620076.lua

---Pain Painter
+--ڥڥ󥿩`
 function c21620076.initial_effect(c)
 	--alias
 	local e1=Effect.CreateEffect(c)
@@ -33,7 +33,7 @@ function c21620076.lvop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS):Filter(Card.IsRelateToEffect,nil,e)
 	local tc=g:GetFirst()
 	while tc do
-		if c21620076.lvfilter(tc) then
+		if tc:IsFaceup() then
 			local e1=Effect.CreateEffect(c)
 			e1:SetType(EFFECT_TYPE_SINGLE)
 			e1:SetCode(EFFECT_CHANGE_LEVEL)

script/c22842214.lua

---Sea Lancer
+--`󥵩`
 function c22842214.initial_effect(c)
 	--equip
 	local e1=Effect.CreateEffect(c)

script/c24362891.lua

---Evo-Instant
+--ͻȻM
 function c24362891.initial_effect(c)
 	--Special Summon
 	local e1=Effect.CreateEffect(c)

script/c25206027.lua

---Interplanetarypurplythorny Dragon
+--μϸo
 function c25206027.initial_effect(c)
 	--special summon
 	local e1=Effect.CreateEffect(c)

script/c25484449.lua

---Wind-Up Shark
+--ޥ`
 function c25484449.initial_effect(c)
 	--spsummon
 	local e1=Effect.CreateEffect(c)

script/c36352429.lua

---Vampire Dragon
+--ヴァンパイア，ドラゴン
 function c36352429.initial_effect(c)
 	--search
 	local e1=Effect.CreateEffect(c)

script/c41930553.lua

---Dark Smog
+--\Κ
 function c41930553.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)

script/c42752141.lua

---Evolzar Dolkka
+--エヴォルカイザー·ドルカ
 function c42752141.initial_effect(c)
 	--xyz summon
 	aux.AddXyzProcedure(c,c42752141.xyzfilter,2)

script/c42874792.lua

---Wind-Up Rabbit
+--ޥӥå
 function c42874792.initial_effect(c)
 	--remove
 	local e1=Effect.CreateEffect(c)

script/c45178472.lua

---Full House
+--եϥ
 function c45178472.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)

script/c4545854.lua

---Xyz Territory
+--エクシーズ·テリトリー
 function c4545854.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)

script/c46291010.lua

---Psi-Beast
+--åө`
 function c46291010.initial_effect(c)
 	--remove
 	local e1=Effect.CreateEffect(c)
@@ -19,11 +19,10 @@ function c46291010.rmtg(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c46291010.rmop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:IsFacedown() or not c:IsRelateToEffect(e) then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	local g=Duel.SelectMatchingCard(tp,c46291010.filter,tp,LOCATION_DECK,0,1,1,nil,c:GetLevel())
 	local tc=g:GetFirst()
-	if tc then
+	if tc and c:IsRelateToEffect(e) and c:IsFaceup() then
 		Duel.Remove(tc,POS_FACEUP,REASON_EFFECT)
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)

script/c47013502.lua

---Dodger Dragon
+--ܥɡɥ饴
 function c47013502.initial_effect(c)
 	--summon
 	local e1=Effect.CreateEffect(c)

script/c50766506.lua

---Ninjitsu Art of Duplication
+--̷ g
 function c50766506.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)

script/c51589188.lua

---Photon Trident
+--フォトン，トライデント
 function c51589188.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)

script/c52601736.lua

---Inzektor Hopper
+--׳װC ۥåѩ`
 function c52601736.initial_effect(c)
 	--equip
 	local e1=Effect.CreateEffect(c)

script/c52823314.lua

---Tour Bus From the Underworld
+--ħkFФХ
 function c52823314.initial_effect(c)
 	--to deck
 	local e1=Effect.CreateEffect(c)

script/c57902193.lua

---Painful Return
+--iܞ
 function c57902193.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_TOHAND)
-	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetCountLimit(1)
@@ -14,15 +13,15 @@ end
 function c57902193.filter(c)
 	return c:IsType(TYPE_MONSTER) and c:IsAbleToHand()
 end
-function c57902193.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
-	if chkc then return chkc:IsControler(tp) and chkc:IsLocation(LOCATION_GRAVE) and c57902193.filter(chkc) end
-	if chk==0 then return Duel.IsExistingTarget(c57902193.filter,tp,LOCATION_GRAVE,0,1,nil) end
-	Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND)
-	Duel.SelectTarget(1-tp,c57902193.filter,tp,LOCATION_GRAVE,0,1,1,nil)
+function c57902193.target(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsExistingMatchingCard(c57902193.filter,tp,LOCATION_GRAVE,0,1,nil) end
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_GRAVE)
 end
 function c57902193.activate(e,tp,eg,ep,ev,re,r,rp)
-	local tc=Duel.GetFirstTarget()
-	if tc:IsRelateToEffect(e) then
+	Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_ATOHAND)
+	local g=Duel.SelectMatchingCard(1-tp,c57902193.filter,tp,LOCATION_GRAVE,0,1,1,nil)
+	local tc=g:GetFirst()
+	if tc then
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 		e1:SetCode(EVENT_PHASE+PHASE_END)
@@ -35,5 +34,7 @@ function c57902193.activate(e,tp,eg,ep,ev,re,r,rp)
 end
 function c57902193.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.SendtoHand(e:GetHandler(),nil,REASON_EFFECT)
-	Duel.ConfirmCards(1-tp,e:GetHandler())
+	if e:GetHandler():IsLocation(LOCATION_HAND) then
+		Duel.ConfirmCards(1-tp,e:GetHandler())
+	end
 end

script/c68124775.lua

---Orient Dragon
+--ꥨȡɥ饴
 function c68124775.initial_effect(c)
 	--synchro summon
 	aux.AddSynchroProcedure(c,nil,aux.NonTuner(nil),1)

script/c69846323.lua

---Piercing Moray
+--ĥĥ
 function c69846323.initial_effect(c)
 	--atkup
 	local e1=Effect.CreateEffect(c)

script/c72563071.lua

---Psychic Shockwave
+--サイコ·ショックウェーブ
 function c72563071.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)

script/c73285669.lua

---Gladiator Beast Essedarii
+--L
 function c73285669.initial_effect(c)
 	--fusion material
 	c:EnableReviveLimit()

script/c73417207.lua

---Mara of the Nordic Alfar
+--O둥ȥ`
 function c73417207.initial_effect(c)
 	--synchro custom
 	local e1=Effect.CreateEffect(c)

script/c79279397.lua

---D-Boyz
+--Dܩ`
 function c79279397.initial_effect(c)
 	--spsummon
 	local e1=Effect.CreateEffect(c)

script/c80495985.lua

---Photon Sabre Tiger
+--フォトン·サーベルタイガー
 function c80495985.initial_effect(c)
 	--search
 	local e1=Effect.CreateEffect(c)

script/c87973893.lua

---Inzektor Axe - Zektahawk
+--樅單蚾及藹葦 未弁玄石奈弁
 function c87973893.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)

script/c88095331.lua

---Evoltile Najasho
+--ɡʥϥ
 function c88095331.initial_effect(c)
 	--search
 	local e1=Effect.CreateEffect(c)
@@ -6,7 +6,7 @@ function c88095331.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_SINGLE)
 	e1:SetCode(EVENT_RELEASE)
-	e1:SetProperty(EFFECT_FLAG_DELAY)
+	e1:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP)
 	e1:SetCondition(c88095331.condition)
 	e1:SetTarget(c88095331.target)
 	e1:SetOperation(c88095331.operation)

script/c93396832.lua

---Smashing Horn
+--½ÇµÑ³Z¤­
 function c93396832.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)

script/c93717133.lua

@@ -16,6 +16,7 @@ function c93717133.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
+	e2:SetHintTiming(TIMING_BATTLE_PHASE)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCondition(c93717133.rmcon)
 	e2:SetTarget(c93717133.rmtg)
@@ -37,8 +38,8 @@ function c93717133.rmtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return false end
 	local a=Duel.GetAttacker()
 	local d=Duel.GetAttackTarget()
-	if chk==0 then return (a==e:GetHandler() and d and d:IsCanBeEffectTarget(e) and a:IsAbleToRemove() and d:IsAbleToRemove())
-		or (d==e:GetHandler() and a:IsCanBeEffectTarget(e) and a:IsAbleToRemove() and d:IsAbleToRemove()) end
+	if chk==0 then return (a==e:GetHandler() and d and d:IsOnField() and d:IsCanBeEffectTarget(e) and a:IsAbleToRemove() and d:IsAbleToRemove())
+		or (d==e:GetHandler() and a:IsOnField() and a:IsCanBeEffectTarget(e) and a:IsAbleToRemove() and d:IsAbleToRemove()) end
 	if a==e:GetHandler() then Duel.SetTargetCard(d)
 	else Duel.SetTargetCard(a) end
 	local g=Group.FromCards(a,d)

script/c94119480.lua

---Adreus, Keeper of Armageddon
+--皺挸及忐荾氪失玉伊它旦
 function c94119480.initial_effect(c)
 	--xyz summon
 	aux.AddXyzProcedure(c,aux.FilterEqualFunction(Card.GetLevel,5),2)

script/c95231062.lua

---Lost Blue Breaker
+--ロスト·ブルー·ブレイカー
 function c95231062.initial_effect(c)
 	--destroy
 	local e1=Effect.CreateEffect(c)

script/c96457619.lua

---Xyz Veil
+--``
 function c96457619.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)

script/c9780364.lua

---Gladiator Taming
+--L{
 function c9780364.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)

script/c99212922.lua

---White Dragon Ninja
+--׸o
 function c99212922.initial_effect(c)
 	--spsummon limit
 	local e1=Effect.CreateEffect(c)