Merge pull request #153 from VanillaSalt/patch13

fix script

script/c1248895.lua

@@ -25,6 +25,7 @@ function c1248895.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if eg:GetCount()==1 then
 		Duel.SetTargetCard(eg)
 	else
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TARGET)
 		local g=eg:FilterSelect(tp,c1248895.filter,1,1,nil,e)
 		Duel.SetTargetCard(g)
 	end

script/c19041767.lua

@@ -33,8 +33,8 @@ function c19041767.condition(e,tp,eg,ep,ev,re,r,rp)
 	return tp~=Duel.GetTurnPlayer()
 end
 function c19041767.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.CheckLPCost(tp,500)
-	else Duel.PayLPCost(tp,500)	end
+	if chk==0 then return Duel.CheckLPCost(tp,500) end
+	Duel.PayLPCost(tp,500)
 end
 function c19041767.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c19041767.filter,tp,LOCATION_HAND+LOCATION_MZONE,0,1,nil) end
@@ -48,7 +48,7 @@ function c19041767.operation(e,tp,eg,ep,ev,re,r,rp)
 	if tc then
 		local s1=tc:IsSummonable(true,nil)
 		local s2=tc:IsMSetable(true,nil)
-		if (s1 and s2 and Duel.SelectOption(tp,aux.Stringid(19041767,1),aux.Stringid(19041767,2))==0) or not s2 then
+		if (s1 and s2 and Duel.SelectPosition(tp,tc,POS_FACEUP_ATTACK+POS_FACEDOWN_DEFENCE)==POS_FACEUP_ATTACK) or not s2 then
 			Duel.Summon(tp,tc,true,nil)
 		else
 			Duel.MSet(tp,tc,true,nil)

script/c22047978.lua

@@ -28,10 +28,10 @@ function c22047978.activate(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) and tc:IsAttackable() and not tc:IsStatus(STATUS_ATTACK_CANCELED) then
 		local g=Duel.GetMatchingGroup(c22047978.cfilter,1-tp,LOCATION_HAND,0,nil)
-		if g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(22047978,0)) then
+		if g:GetCount()>0 and Duel.SelectYesNo(1-tp,aux.Stringid(22047978,0)) then
 			Duel.Hint(HINT_SELECTMSG,1-tp,HINTMSG_CONFIRM)
 			local cg=g:Select(1-tp,1,1,nil)
-			Duel.ConfirmCards(tp,g)
+			Duel.ConfirmCards(tp,cg)
 			Duel.ShuffleHand(1-tp)
 			return
 		end

script/c22869904.lua

@@ -12,7 +12,7 @@ function c22869904.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c22869904.cfilter(c,tp)
-	return c:IsType(TYPE_SPELL) and c:IsPreviousLocation(LOCATION_SZONE)
+	return c:IsType(TYPE_SPELL) and c:IsPreviousLocation(LOCATION_SZONE) and c:IsPreviousPosition(POS_FACEUP)
 		and c:GetPreviousControler()==1-tp and c:GetPreviousSequence()~=5
 end
 function c22869904.condition(e,tp,eg,ep,ev,re,r,rp)

script/c23269426.lua

@@ -23,7 +23,7 @@ function c23269426.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 		and Duel.IsExistingTarget(c23269426.filter,tp,LOCATION_MZONE,0,1,nil,e,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
 	local g=Duel.SelectTarget(tp,c23269426.filter,tp,LOCATION_MZONE,0,1,1,nil,e,tp)
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND+LOCATION_GRAVE)
 end
 function c23269426.activate(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end

script/c47387961.lua

@@ -11,7 +11,6 @@ function c47387961.initial_effect(c)
 	e1:SetCountLimit(1)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetCost(c47387961.cost)
 	e1:SetTarget(c47387961.target)
 	e1:SetOperation(c47387961.operation)
 	c:RegisterEffect(e1)
@@ -19,10 +18,6 @@ end
 function c47387961.xyzfilter(c)
 	return c:IsSetCard(0x76) and c:GetLevel()==4
 end
-function c47387961.cost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
-	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
-end
 function c47387961.filter(c)
 	return c:IsFaceup() and c:IsType(TYPE_XYZ)
 end
@@ -48,10 +43,6 @@ function c47387961.operation(e,tp,eg,ep,ev,re,r,rp)
 		e2:SetCode(EFFECT_SET_BASE_ATTACK)
 		e2:SetValue(tc:GetTextAttack())
 		c:RegisterEffect(e2)
-		local e3=e1:Clone()
-		e3:SetCode(EFFECT_SET_BASE_DEFENCE)
-		e3:SetValue(tc:GetTextDefence())
-		c:RegisterEffect(e3)
 		c:CopyEffect(code,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END,1)
 		local e4=Effect.CreateEffect(c)
 		e4:SetType(EFFECT_TYPE_SINGLE)
@@ -62,10 +53,12 @@ function c47387961.operation(e,tp,eg,ep,ev,re,r,rp)
 		local e5=Effect.CreateEffect(c)
 		e5:SetType(EFFECT_TYPE_SINGLE)
 		e5:SetCode(EFFECT_DISABLE)
+		e5:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
 		tc:RegisterEffect(e5)
 		local e6=Effect.CreateEffect(c)
 		e6:SetType(EFFECT_TYPE_SINGLE)
 		e6:SetCode(EFFECT_DISABLE_EFFECT)
+		e6:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
 		tc:RegisterEffect(e6)
 	end
 end

script/c48009503.lua

@@ -10,6 +10,7 @@ function c48009503.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e1:SetRange(LOCATION_MZONE)
+	e1:SetCountLimit(1)
 	e1:SetCost(c48009503.cost)
 	e1:SetTarget(c48009503.target)
 	e1:SetOperation(c48009503.operation)

script/c51281878.lua

@@ -8,10 +8,15 @@ function c51281878.initial_effect(c)
 	e1:SetProperty(EFFECT_FLAG_NO_TURN_RESET)
 	e1:SetRange(LOCATION_GRAVE)
 	e1:SetCountLimit(1)
+	e1:SetTarget(c51281878.cost)
 	e1:SetTarget(c51281878.target)
 	e1:SetOperation(c51281878.operation)
 	c:RegisterEffect(e1)
 end
+function c51281878.cost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.GetFlagEffect(tp,51281878)==0 end
+	Duel.RegisterFlagEffect(tp,51281878,RESET_PHASE+PHASE_END,EFFECT_FLAG_OATH,1)
+end
 function c51281878.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>0
 		and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end

script/c57319935.lua

@@ -62,7 +62,7 @@ function c57319935.activate(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Damage(tp,tc2:GetAttack(),REASON_EFFECT)
 	else
 		local g1=Duel.GetFieldGroup(tp,LOCATION_EXTRA,0)
-		local g2=Duel.GetFieldGroup(tp,LOCATION_EXTRA,0)
+		local g2=Duel.GetFieldGroup(1-tp,LOCATION_EXTRA,0)
 		Duel.ConfirmCards(tp,g2)
 		Duel.ConfirmCards(1-tp,g1)
 	end

script/c61254509.lua

@@ -4,7 +4,7 @@ function c61254509.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(61254509,0))
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
+	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e1:SetCondition(c61254509.condition)
 	e1:SetTarget(c61254509.target)
@@ -19,7 +19,7 @@ function c61254509.filter(c)
 end
 function c61254509.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c61254509.filter(chkc) end
-	if chk==0 then return true end
+	if chk==0 then return Duel.IsExistingTarget(c61254509.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_FACEUP)
 	Duel.SelectTarget(tp,c61254509.filter,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
 end

script/c60811206.lua → script/c68811206.lua

 --Tyler the Great Warrior
-function c60811206.initial_effect(c)
+function c68811206.initial_effect(c)
 	--spsummon condition
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
@@ -8,22 +8,22 @@ function c60811206.initial_effect(c)
 	c:RegisterEffect(e1)
 	--damage
 	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(60811206,0))
+	e2:SetDescription(aux.Stringid(68811206,0))
 	e2:SetCategory(CATEGORY_DAMAGE)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e2:SetCode(EVENT_BATTLE_DESTROYING)
-	e2:SetCondition(c60811206.damcon)
-	e2:SetTarget(c60811206.damtg)
-	e2:SetOperation(c60811206.damop)
+	e2:SetCondition(c68811206.damcon)
+	e2:SetTarget(c68811206.damtg)
+	e2:SetOperation(c68811206.damop)
 	c:RegisterEffect(e2)
 end
-function c60811206.damcon(e,tp,eg,ep,ev,re,r,rp)
+function c68811206.damcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local bc=c:GetBattleTarget()
 	return c:IsRelateToBattle() and bc:IsLocation(LOCATION_GRAVE) and bc:IsType(TYPE_MONSTER)
 end
-function c60811206.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
+function c68811206.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	local c=e:GetHandler()
 	local bc=c:GetBattleTarget()
@@ -33,7 +33,7 @@ function c60811206.damtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetTargetParam(dam)
 	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,nil,0,1-tp,dam)
 end
-function c60811206.damop(e,tp,eg,ep,ev,re,r,rp)
+function c68811206.damop(e,tp,eg,ep,ev,re,r,rp)
 	local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
 	Duel.Damage(p,d,REASON_EFFECT)
 end

script/c79333300.lua

@@ -25,7 +25,6 @@ function c79333300.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	Duel.SetOperationInfo(0,CATEGORY_TODECK,g,g:GetCount(),0,0)
 end
 function c79333300.activate(e,tp,eg,ep,ev,re,r,rp)
-	local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
 	local tc=Duel.GetFirstTarget()
 	if tc and tc:IsRelateToEffect(e) then
 		Duel.SendtoDeck(tc,nil,1,REASON_EFFECT)

script/c97697447.lua

@@ -25,7 +25,7 @@ end
 function c97697447.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then
 		if e:GetLabel()==0 then
-			Duel.IsExistingMatchingCard(Card.IsType,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,e:GetHandler(),TYPE_SPELL+TYPE_TRAP)
+			return Duel.IsExistingMatchingCard(Card.IsType,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,e:GetHandler(),TYPE_SPELL+TYPE_TRAP)
 		end
 		e:SetLabel(0)
 		return Duel.IsExistingMatchingCard(c97697447.filter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,e:GetHandler(),tp)

script/c9888196.lua

@@ -88,9 +88,6 @@ function c9888196.hdcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local g=Duel.GetFieldGroup(tp,LOCATION_HAND,0)
 	Duel.SendtoGrave(g,REASON_COST)
 end
-function c9888196.filter2(c)
-	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsDestructable()
-end
 function c9888196.hdtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)>0 end
 	Duel.SetOperationInfo(0,CATEGORY_HANDES,nil,0,1-tp,0)

script/c99075257.lua

@@ -21,7 +21,7 @@ end
 function c99075257.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c99075257.filter,tp,LOCATION_DECK,0,1,nil,eg:GetFirst():GetLevel()) end
 	e:SetLabel(eg:GetFirst():GetLevel())
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_DECK)
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
 end
 function c99075257.operation(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)