Merge pull request #627 from sidschingis/master

fix

script/c17078030.lua

@@ -22,7 +22,7 @@ function c17078030.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local t={}
 	local f=math.floor((lp-1)/1000)
 	local l=1
-	while l<=f and l<=10 do
+	while l<=f and l<=20 do
 		t[l]=l*1000
 		l=l+1
 	end

script/c32543380.lua

@@ -49,7 +49,12 @@ function c32543380.spop(e,tp,eg,ep,ev,re,r,rp,c)
 	Duel.SendtoGrave(g, REASON_COST)
 end
 function c32543380.descon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():IsRelateToBattle()
+	local c=e:GetHandler()
+	local a=Duel.GetAttacker()
+	local d=Duel.GetAttackTarget()
+	if a~=c then d=a end
+	return c:IsRelateToBattle() and c:IsFaceup()
+		and d and d:GetLocation()==LOCATION_GRAVE and d:IsType(TYPE_MONSTER)
 end
 function c32543380.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

script/c35220244.lua

@@ -66,7 +66,7 @@ function c35220244.atkop(e,tp,eg,ep,ev,re,r,rp)
 end
 function c35220244.discon(e,tp,eg,ep,ev,re,r,rp)
 	local ec=e:GetHandler():GetEquipTarget()
-	return ec and (ec==Duel.GetAttacker() or ec==Duel.GetAttackTarget()) and ec:GetBattleTarget()
+	return ec and ec:GetControler()==tp and (ec==Duel.GetAttacker() or ec==Duel.GetAttackTarget()) and ec:GetBattleTarget()
 end
 function c35220244.disop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=e:GetHandler():GetEquipTarget():GetBattleTarget()

script/c39980304.lua

@@ -58,4 +58,4 @@ function c39980304.chain_operation(e,te,tp,tc,mat,sumtype)
 end
 function c39980304.desop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Destroy(e:GetHandler(),REASON_EFFECT)
-end
+end
\ No newline at end of file

script/c71209500.lua

@@ -30,7 +30,7 @@ function c71209500.efop(e,tp,eg,ep,ev,re,r,rp)
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetCode(EFFECT_CANNOT_BE_EFFECT_TARGET)
-		e1:SetValue(1)
+		e1:SetValue(c71209500.efilter)
 		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
 		tc:RegisterEffect(e1)
 		local e2=Effect.CreateEffect(c)
@@ -42,3 +42,6 @@ function c71209500.efop(e,tp,eg,ep,ev,re,r,rp)
 		tc=g:GetNext()
 	end
 end
+function c71209500.efilter(e,re)
+	return re:GetHandler():IsType(TYPE_MONSTER)
+end
\ No newline at end of file

script/c86516889.lua

@@ -6,6 +6,7 @@ function c86516889.initial_effect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetHintTiming(0,0x1e0)
 	e1:SetTarget(c86516889.target)
 	e1:SetOperation(c86516889.activate)
 	c:RegisterEffect(e1)