Merge pull request #12 from Sonic714/master

6.12 yume fix

expansions/script/c71400048.lua

@@ -2,7 +2,7 @@
 xpcall(function() require("expansions/script/c71400001") end,function() require("script/c71400001") end)
 function c71400048.initial_effect(c)
 	--synchro summon
-	aux.AddSynchroMixProcedure(c,aux.Tuner(yume.YumeCheck(c)),nil,nil,c71400048.mfilter,1,99,c71400048.gfilter)
+	aux.AddSynchroMixProcedure(c,aux.Tuner(yume.YumeCheck,c),nil,nil,c71400048.mfilter,1,99,c71400048.gfilter(c))
 	--summon limit
 	yume.AddYumeSummonLimit(c,1)
 	--atkup
@@ -42,8 +42,10 @@ end
 function c71400048.mfilter(c,sc)
 	return c:IsSetCard(0x714) and c:IsNotTuner(sc) or c:IsType(TYPE_TUNER)
 end
-function c71400048.gfilter(g,syncard,c1)
-	return g:IsExists(Card.IsNotTuner,1,c1,syncard)
+function c71400048.gfilter(c)
+	return  function(g,syncard)
+				return g:IsExists(Card.IsNotTuner,1,nil,c)
+			end
 end
 function c71400048.val(e,c)
 	return Duel.GetMatchingGroupCount(c71400048.filter1,c:GetControler(),LOCATION_GRAVE+LOCATION_MZONE,0,nil)*500
@@ -64,7 +66,7 @@ function c71400048.op2(e,tp,eg,ep,ev,re,r,rp)
 	e2:SetCode(EFFECT_CANNOT_ATTACK)
 	e2:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e2:SetTarget(c71400048.ftarget)
-	e2:SetLabel(tc:GetFieldID())
+	e2:SetLabel(c:GetFieldID())
 	e2:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e2,tp)
 end

expansions/script/c71400054.lua

@@ -60,7 +60,7 @@ end
 function c71400054.tg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_REMOVED) and chkc:IsControler(tp) and c71400054.filter2(chkc,e,tp) end
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and Duel.IsExistingTarget(c71400054.filter,tp,LOCATION_REMOVED,0,1,nil,e,tp) end
+		and Duel.IsExistingTarget(c71400054.filter2,tp,LOCATION_REMOVED,0,1,nil,e,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local g=Duel.SelectTarget(tp,c71400054.filter2,tp,LOCATION_REMOVED,0,1,1,nil,e,tp)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,0,LOCATION_REMOVED)

expansions/script/c71400066.lua

@@ -39,7 +39,7 @@ end
 function c71400066.tg1(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsOnField() and chkc~=e:GetHandler() end
 	if chk==0 then
-		return Duel.CheckLPCost(tp,1000) and yume.YumeFieldCheck(tp,0,2,LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED)
+		return Duel.CheckLPCost(tp,1000) and yume.YumeFieldCheck(tp,0,2,LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED) and Duel.IsExistingTarget(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
 	end
 	if not Duel.CheckPhaseActivity() then e:SetLabel(1) else e:SetLabel(0) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
@@ -76,7 +76,7 @@ end
 function c71400066.tg1a(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsOnField() and chkc~=e:GetHandler() end
 	if chk==0 then
-		return Duel.CheckLPCost(tp,1000) and yume.YumeFieldCheck(tp,0,2,LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED) and Duel.IsExistingMatchingCard(c71400066.filter1a,tp,LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil)
+		return Duel.CheckLPCost(tp,1000) and yume.YumeFieldCheck(tp,0,2,LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED) and Duel.IsExistingTarget(aux.TRUE,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil) and Duel.IsExistingMatchingCard(c71400066.filter1a,tp,LOCATION_DECK+LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil)
 	end
 	if not Duel.CheckPhaseActivity() then e:SetLabel(1) else e:SetLabel(0) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)