Merge pull request #9 from Sonic714/master

6.11 yume fix

expansions/script/c71400011.lua

@@ -29,7 +29,6 @@ function c71400011.initial_effect(c)
 	e2:SetCost(c71400011.cost)
 	e2:SetTarget(c71400011.tg2)
 	e2:SetOperation(c71400011.op2)
-	e2:SetCondition(c71400011.con2)
 	e2:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE)
 	c:RegisterEffect(e2)
 	--fly away
@@ -69,9 +68,6 @@ function c71400011.op1(e,tp,eg,ep,ev,re,r,rp)
 		Duel.ConfirmCards(1-tp,g)
 	end
 end
-function c71400011.con2(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():IsStatus(STATUS_SPSUMMON_TURN)
-end
 function c71400011.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)

expansions/script/c71400014.lua

@@ -20,8 +20,8 @@ function c71400014.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(71400014,1))
 	e2:SetCategory(CATEGORY_TOGRAVE)
-	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
-	e2:SetCode(EVENT_SPSUMMON_SUCCESS)
+	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_QUICK_O)
+	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetRange(LOCATION_FZONE)
 	e2:SetCountLimit(1)
 	e2:SetCost(c71400014.cost2)

expansions/script/c71400016.lua

@@ -12,6 +12,7 @@ function c71400016.initial_effect(c)
 	e1:SetCategory(CATEGORY_SUMMON)
 	e1:SetType(EFFECT_TYPE_QUICK_O)
 	e1:SetRange(LOCATION_FZONE)
+	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetCountLimit(1)
 	e1:SetCondition(c71400016.con1)
 	e1:SetTarget(c71400016.tg1)
@@ -90,7 +91,7 @@ function c71400016.checkop(e,tp,eg,ep,ev,re,r,rp)
 	e2:SetLabel(1)
 end
 function c71400016.reccon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetLabel()==1 and c:IsPreviousLocation(LOCATION_MZONE)
+	return e:GetLabel()==1 and e:GetHandler():IsPreviousLocation(LOCATION_MZONE)
 end
 function c71400016.recop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Recover(tp,e:GetLabelObject():GetBaseAttack(),REASON_EFFECT)

expansions/script/c71400025.lua

@@ -56,7 +56,7 @@ function c71400025.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.RegisterEffect(e1,tp)
 end
 function c71400025.splimit(e,c,sump,sumtype,sumpos,targetp,se)
-	return not (c:IsType(TYPE_LINK)) and c:IsLocation(LOCATION_EXTRA)
+	return not (c:IsType(TYPE_LINK) and c:IsSetCard(0x714)) and c:IsLocation(LOCATION_EXTRA)
 end
 function c71400025.tg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsType(TYPE_LINK) and chkc:IsLocation(LOCATION_MZONE) end

expansions/script/c71400032.lua

@@ -9,6 +9,7 @@ function c71400032.initial_effect(c)
 	e1:SetRange(LOCATION_FZONE)
 	e1:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e1:SetCode(EFFECT_CHANGE_RACE)
+	e1:SetTarget(c71400032.tg1)
 	e1:SetValue(RACE_PLANT)
 	c:RegisterEffect(e1)
 	--disable
@@ -27,9 +28,12 @@ function c71400032.initial_effect(c)
 	--self to deck & activate field
 	yume.AddYumeFieldGlobal(c,71400032,2)
 end
+function c71400032.tg1(e,c)
+	return not c71400032.filter2b(c)
+end
 function c71400032.con2(e,tp,eg,ep,ev,re,r,rp)
 	local ph=Duel.GetCurrentPhase()
-	return ph==PHASE_MAIN1 or ph==PHASE_MAIN2
+	return Duel.IsExistingMatchingCard(c71400032.filter2,tp,LOCATION_MZONE,LOCATION_MZONE,4,nil) and (ph==PHASE_MAIN1 or ph==PHASE_MAIN2)
 end
 function c71400032.tg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_MZONE) and c71400032.filter2(chkc) end

expansions/script/c71400033.lua

@@ -42,7 +42,7 @@ function c71400033.operation(e,tp,eg,ep,ev,re,r,rp)
 		Duel.SetLP(tp,Duel.GetLP(tp)-1500)
 		local fc=Duel.GetFieldCard(tp,LOCATION_FZONE,0)
 		if fc and yume.YumeCheckFilter(fc) then
-			Duel.SendtoDeck(c,nil,2,REASON_EFFECT)
+			Duel.SendtoDeck(fc,nil,2,REASON_EFFECT)
 		end
 	end
 	if c:IsRelateToEffect(e) and c:IsCanTurnSet() then

expansions/script/c71400036.lua

@@ -20,7 +20,7 @@ function c71400036.initial_effect(c)
 	e2:SetCountLimit(1,71500036)
 	e2:SetCategory(CATEGORY_TOHAND)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e2:SetCode(EVENT_TO_GRAVE)
+	e2:SetCode(EVENT_MOVE)
 	e2:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY)
 	e2:SetCondition(c71400036.con2)
 	e2:SetTarget(c71400036.tg2)

expansions/script/c71400043.lua

@@ -86,6 +86,7 @@ function c71400043.tg2(e,tp,eg,ep,ev,re,r,rp,chk)
 		if fc and fc:IsFaceup() then id=fc:GetCode() end
 		return yume.YumeFieldCheck(tp,id,2,LOCATION_GRAVE+LOCATION_DECK)
 	end
+	if not Duel.CheckPhaseActivity() then e:SetLabel(1) else e:SetLabel(0) end
 end
 function c71400043.op2(e,tp,eg,ep,ev,re,r,rp)
 	local fc=Duel.GetFieldCard(tp,LOCATION_FZONE,0)