ndyd

expansions/script/c71400001.lua

@@ -32,7 +32,7 @@ function c71400001.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.PayLPCost(tp,500)
 end
 function c71400001.activate1(e,tp,eg,ep,ev,re,r,rp)
-	yume.ActivateYumeField(tp,nil,1)
+	yume.ActivateYumeField(e,tp,nil,1)
 end
 function c71400001.activate2(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
@@ -242,7 +242,7 @@ function yume.YumeFieldCheckTarget(id,ft,loc)
 		if not Duel.CheckPhaseActivity() then e:SetLabel(1) else e:SetLabel(0) end
 	end
 end
-function yume.ActivateYumeField(tp,id,ft,loc)
+function yume.ActivateYumeField(e,tp,id,ft,loc)
 	ft=ft or 0
 	id=id or 0
 	loc=loc or LOCATION_DECK
@@ -287,7 +287,7 @@ function yume.ActivateFieldOp(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local id=yume.temp_card_field[c].id
 	local ft=yume.temp_card_field[c].ft
-	yume.ActivateYumeField(tp,id,ft,LOCATION_DECK+LOCATION_HAND)
+	yume.ActivateYumeField(e,tp,id,ft,LOCATION_DECK+LOCATION_HAND)
 end
 --uniquify the same name
 function yume.UniquifyCardName(g)

expansions/script/c71400013.lua

@@ -41,7 +41,7 @@ function c71400013.filter2(c)
 end
 function c71400013.op1(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	local tc=yume.ActivateYumeField(tp,nil,1)
+	local tc=yume.ActivateYumeField(e,tp,nil,1)
 	local dg=Duel.GetMatchingGroup(c71400013.filter1a,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
 	if tc and dg:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(71400013,3)) then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
@@ -50,6 +50,7 @@ function c71400013.op1(e,tp,eg,ep,ev,re,r,rp)
 		Duel.BreakEffect()
 		Duel.SendtoGrave(des,REASON_EFFECT)
 	end
+--[[
 	local el1=Effect.CreateEffect(c)
 	el1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	el1:SetType(EFFECT_TYPE_FIELD)
@@ -64,6 +65,7 @@ function c71400013.op1(e,tp,eg,ep,ev,re,r,rp)
 	local el3=el1:Clone()
 	el3:SetCode(EFFECT_CANNOT_SPECIAL_SUMMON)
 	c:RegisterEffect(el3)
+--]]
 end
 function c71400013.op2(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()

expansions/script/c71400020.lua

@@ -25,6 +25,7 @@ end
 function c71400020.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	local g=Duel.GetMatchingGroup(Card.IsAbleToRemove,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,e:GetHandler(),tp,POS_FACEDOWN)
 	if chk==0 then return yume.YumeFieldCheckTarget(0,1,LOCATION_DECK+LOCATION_GRAVE+LOCATION_HAND) and g:GetCount()>0 end
+	if not Duel.CheckPhaseActivity() then e:SetLabel(1) else e:SetLabel(0) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,0,tp,0)
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,g,g:GetCount(),0,0)
 	if e:IsHasType(EFFECT_TYPE_ACTIVATE) then
@@ -33,7 +34,7 @@ function c71400020.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c71400020.op1(e,tp,eg,ep,ev,re,r,rp)
 	local rg=Duel.GetMatchingGroup(Card.IsAbleToRemove,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,aux.ExceptThisCard(e),tp,POS_FACEDOWN)
-	if Duel.Remove(rg,POS_FACEDOWN,REASON_EFFECT)>0 and yume.ActivateYumeField(tp,0,1,LOCATION_DECK+LOCATION_GRAVE+LOCATION_HAND) then
+	if Duel.Remove(rg,POS_FACEDOWN,REASON_EFFECT)>0 and yume.ActivateYumeField(e,tp,0,1,LOCATION_DECK+LOCATION_GRAVE+LOCATION_HAND) then
 		local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
 		if ft<=0 then return end
 		if Duel.IsPlayerAffectedByEffect(tp,59822133) then ft=1 end

expansions/script/c71400023.lua

@@ -41,7 +41,7 @@ function c71400023.filter1(c,tp)
 end
 function c71400023.op1(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	local tc=yume.ActivateYumeField(tp)
+	local tc=yume.ActivateYumeField(e,tp)
 	if tc then
 		local e1=Effect.CreateEffect(c)
 		e1:SetDescription(aux.Stringid(71400023,2))

expansions/script/c71400025.lua

@@ -28,14 +28,14 @@ function c71400025.initial_effect(c)
 	Duel.AddCustomActivityCounter(71400025,ACTIVITY_SPSUMMON,c71400025.counterfilter)
 end
 function c71400025.counterfilter(c)
-	return c:GetSummonLocation()~=LOCATION_EXTRA or c:IsType(TYPE_LINK)
+	return c:GetSummonLocation()~=LOCATION_EXTRA or c:IsType(TYPE_LINK) and c:IsSetCard(0x714)
 end
 function c71400025.cost1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.CheckLPCost(tp,800) end
 	Duel.PayLPCost(tp,800)
 end
 function c71400025.op1(e,tp,eg,ep,ev,re,r,rp)
-	yume.ActivateYumeField(tp,nil,2)
+	yume.ActivateYumeField(e,tp,nil,2)
 end
 function c71400025.filter2(c)
 	return c:IsType(TYPE_LINK)
@@ -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/c71400035.lua

@@ -52,7 +52,7 @@ function c71400035.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c71400035.op1(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	yume.ActivateYumeField(tp,0,0,LOCATION_DECK+LOCATION_REMOVED)
+	yume.ActivateYumeField(e,tp,0,0,LOCATION_DECK+LOCATION_REMOVED)
 	if Duel.GetFieldGroupCount(tp,0,LOCATION_ONFIELD)>Duel.GetFieldGroupCount(tp,LOCATION_ONFIELD,0) then
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_FIELD)

expansions/script/c71400043.lua

@@ -92,7 +92,7 @@ function c71400043.op2(e,tp,eg,ep,ev,re,r,rp)
 	local fc=Duel.GetFieldCard(tp,LOCATION_FZONE,0)
 	local id=0
 	if fc and fc:IsFaceup() then id=fc:GetCode() end
-	yume.ActivateYumeField(tp,id,2,LOCATION_GRAVE+LOCATION_DECK)
+	yume.ActivateYumeField(e,tp,id,2,LOCATION_GRAVE+LOCATION_DECK)
 end
 function c71400043.con3(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetFlagEffect(tp,71400038)>0

expansions/script/c71400053.lua

@@ -32,10 +32,11 @@ function c71400053.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c71400053.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return yume.YumeFieldCheck(tp,0,2) end
+	if not Duel.CheckPhaseActivity() then e:SetLabel(1) else e:SetLabel(0) end
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
 end
 function c71400053.op1(e,tp,eg,ep,ev,re,r,rp)
-	if yume.ActivateYumeField(tp,nil,2) then
+	if yume.ActivateYumeField(e,tp,nil,2) then
 		Duel.BreakEffect()
 		local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
 		Duel.Draw(p,d,REASON_EFFECT)

expansions/script/c71400056.lua

@@ -58,7 +58,7 @@ function c71400056.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c71400056.op1(e,tp,eg,ep,ev,re,r,rp)
 	if not Duel.NegateEffect(ev) then return end
-	if yume.ActivateYumeField(tp,0,0,LOCATION_HAND+LOCATION_GRAVE) and not e:GetHandler():IsStatus(STATUS_ACT_FROM_HAND) and e:IsHasType(EFFECT_TYPE_ACTIVATE) then
+	if yume.ActivateYumeField(e,tp,0,0,LOCATION_HAND+LOCATION_GRAVE) and not e:GetHandler():IsStatus(STATUS_ACT_FROM_HAND) and e:IsHasType(EFFECT_TYPE_ACTIVATE) then
 		Duel.DiscardDeck(tp,3,REASON_EFFECT)
 	end
 end

expansions/script/c71402000.lua

@@ -84,6 +84,7 @@ function c71402000.eftg(e,tp,eg,ep,ev,re,r,rp,chk)
 	e1:SetTarget(c71402000.splimit)
 	e1:SetReset(RESET_PHASE+PHASE_END)
 	Duel.RegisterEffect(e1,tp)
+	if not Duel.CheckPhaseActivity() then e:SetLabel(1) else e:SetLabel(0) end
 	Duel.SetOperationInfo(0,CATEGORY_DICE,nil,0,tp,1)
 end
 function c71402000.spcon(e,tp,eg,ep,ev,re,r,rp)
@@ -110,7 +111,7 @@ function c71402000.filter3(c)
 end
 function c71402000.efop(e,tp,eg,ep,ev,re,r,rp)
 	local dc=Duel.TossDice(tp,1)
-	if dc==1 then yume.ActivateYumeField(tp)
+	if dc==1 then yume.ActivateYumeField(e,tp)
 	elseif dc==2 then
 		if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
@@ -121,7 +122,7 @@ function c71402000.efop(e,tp,eg,ep,ev,re,r,rp)
 	elseif dc==3 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 		local g=Duel.SelectMatchingCard(tp,c71402000.filter2,tp,LOCATION_DECK,0,1,1,nil)
-		if g:GetCount()>0 then Duel.SendtoGrave(g,REASON_EFFECT) end
+		if g:GetCount()>0 then Duel.SendtoGrave(g,REASON_EFFECT)>0 end
 	elseif dc==4 then
 		local thg=Duel.GetMatchingGroup(c71402000.filter3,tp,LOCATION_GRAVE,0,nil)
 		if thg:GetCount()>0