Merge pull request #14 from Sonic714/master

22.11.19 yume upd

expansions/script/c71400001.lua

@@ -59,7 +59,6 @@ end
 end
 --global part
 table=require("table")
-yume.RustFlag=false
 function yume.AddYumeSummonLimit(c,ssm)
 --1=special summon monster, 0=non special summon monster
 	ssm=ssm or 0

expansions/script/c71400002.lua

@@ -14,11 +14,16 @@ function c71400002.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetType(EFFECT_TYPE_FIELD)
 	e2:SetRange(LOCATION_MZONE)
-	e2:SetTargetRange(LOCATION_GRAVE+LOCATION_MZONE,0)
+	e2:SetTargetRange(LOCATION_MZONE,0)
 	e2:SetCode(EFFECT_CHANGE_ATTRIBUTE)
+	e2:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x714))
 	e2:SetValue(ATTRIBUTE_WATER)
 	e2:SetCondition(yume.YumeCon)
 	c:RegisterEffect(e2)
+	local e2g=e2:Clone()
+	e2g:SetTargetRange(LOCATION_GRAVE,0)
+	e2g:SetCondition(c71400002.gravecon)
+	c:RegisterEffect(e2g)
 	--to deck
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(71400002,0))
@@ -46,6 +51,10 @@ function c71400002.condition1(e,c)
 		and Duel.GetFieldGroupCount(tp,LOCATION_ONFIELD,LOCATION_ONFIELD)>0
 		and Duel.IsExistingMatchingCard(c71400002.filter1,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,nil)
 end
+function c71400002.gravecon(e)
+	local tp=e:GetHandlerPlayer()
+	return yume.IsYumeFieldOnField(tp) and not Duel.IsPlayerAffectedByEffect(tp,EFFECT_NECRO_VALLEY)
+end
 function c71400002.target3(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local c=e:GetHandler()
 	if chkc then return chkc:IsLocation(LOCATION_MZONE+LOCATION_GRAVE) and c71400002.filter3(chkc) and chkc~=c end

expansions/script/c71400024.lua

@@ -2,7 +2,7 @@
 xpcall(function() require("expansions/script/c71400001") end,function() require("script/c71400001") end)
 function c71400024.initial_effect(c)
 	--link summon
-	aux.AddLinkProcedure(c,aux.FilterBoolFunction(Card.IsLinkType,TYPE_EFFECT),2,2,c71400024.lcheck(c))
+	aux.AddLinkProcedure(c,c71400024.mfilter,2,2,yume.YumeCheck(c))
 	--summon limit
 	yume.AddYumeSummonLimit(c,1)
 	--banish
@@ -21,7 +21,7 @@ function c71400024.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(71400024,1))
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e2:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
 	e2:SetCode(EVENT_LEAVE_FIELD)
 	e2:SetCountLimit(1,71500024)
@@ -30,10 +30,7 @@ function c71400024.initial_effect(c)
 	e2:SetOperation(c71400024.op2)
 	c:RegisterEffect(e2)
 end
-function c71400024.lcheck(c)
-	return function(g) return yume.IsYumeFieldOnField(c:GetControler()) and g:IsExists(c71400024.lcfilter,1,nil) end
-end
-function c71400024.lcfilter(c)
+function c71400024.mfilter(c)
 	return c:GetBaseAttack()>2500 and c:GetOriginalAttribute()==ATTRIBUTE_DARK and c:IsLinkSetCard(0x714)
 end
 function c71400024.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -50,15 +47,14 @@ function c71400024.op1(e,tp,eg,ep,ev,re,r,rp)
 end
 function c71400024.con2(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return c:IsSummonType(SUMMON_TYPE_LINK) and (c:IsReason(REASON_BATTLE) or c:IsReason(REASON_EFFECT)) and c:IsPreviousLocation(LOCATION_MZONE)
+	return (c:IsReason(REASON_BATTLE) or c:IsReason(REASON_EFFECT)) and c:IsPreviousLocation(LOCATION_MZONE)
 end
 function c71400024.filter2(c,e,tp)
 	return c:GetBaseAttack()>2500 and c:GetOriginalAttribute()==ATTRIBUTE_DARK and c:IsSetCard(0x714) and c:IsCanBeSpecialSummoned(e,0,tp,false,false) and not c:IsCode(71400024)
 end
 function c71400024.tg2(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c71400024.filter2(chkc,e,tp) end
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and Duel.IsExistingTarget(c71400024.filter2,tp,LOCATION_GRAVE,0,1,nil,e,tp) end
+	if chk==0 then return true end
 	local ct=Duel.GetLocationCount(1-tp,LOCATION_MZONE)
 	if ct>2 then ct=2 end
 	if Duel.IsPlayerAffectedByEffect(tp,59822133) then ct=1 end

expansions/script/c71400028.lua

@@ -50,7 +50,7 @@ function c71400028.filter2(c,e,tp)
 	return c:IsCode(71400030) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_LINK,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
 end
 function c71400028.tg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c71400028.filter2,tp,LOCATION_EXTRA,0,1,nil,e,tp) and aux.MustMaterialCheck(nil,tp,EFFECT_MUST_BE_LMATERIAL) end
+	if chk==0 then return true end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
 function c71400028.op2(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c71400032.lua

@@ -22,6 +22,7 @@ function c71400032.initial_effect(c)
 	e2:SetRange(LOCATION_FZONE)
 	e2:SetCountLimit(1)
 	e2:SetCondition(c71400032.con2)
+	e2:SetCost(c71400032.cost2)
 	e2:SetTarget(c71400032.tg2)
 	e2:SetOperation(c71400032.op2)
 	c:RegisterEffect(e2)
@@ -33,11 +34,21 @@ function c71400032.tg1(e,c)
 end
 function c71400032.con2(e,tp,eg,ep,ev,re,r,rp)
 	local ph=Duel.GetCurrentPhase()
-	return Duel.IsExistingMatchingCard(c71400032.filter2con,tp,LOCATION_MZONE,LOCATION_MZONE,4,nil) and (ph==PHASE_MAIN1 or ph==PHASE_MAIN2)
+	return ph==PHASE_MAIN1 or ph==PHASE_MAIN2
+end
+function c71400032.filterc2(c)
+	return c:IsFaceup() and c:IsSetCard(0x714) and c:IsRace(RACE_PLANT) and c:IsAbleToGraveAsCost() and Duel.IsExistingTarget(c71400032.filter2,tp,LOCATION_MZONE,LOCATION_MZONE,1,c)
+end
+function c71400032.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
+	local c=e:GetHandler()
+	if chk==0 then return Duel.IsExistingMatchingCard(c71400032.filterc2,tp,LOCATION_ONFIELD,0,1,c) end
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
+	local g=Duel.SelectMatchingCard(tp,c71400032.filterc2,tp,LOCATION_ONFIELD,0,1,1,c)
+	Duel.SendtoGrave(g,REASON_COST)
 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
-	if chk==0 then return Duel.IsExistingTarget(c71400032.filter2,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
+	if chk==0 then return true end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISABLE)
 	local g=Duel.SelectTarget(tp,c71400032.filter2,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
 	Duel.SetOperationInfo(0,CATEGORY_DISABLE,g,1,0,0)
@@ -57,7 +68,8 @@ function c71400032.op2(e,tp,eg,ep,ev,re,r,rp)
 		e2:SetCode(EFFECT_CANNOT_ATTACK)
 		tc:RegisterEffect(e2)
 		local g=Duel.GetMatchingGroup(c71400032.filter2a,tp,LOCATION_DECK+LOCATION_GRAVE,0,nil)
-		if Duel.IsExistingMatchingCard(c71400032.filter2b,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) and g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(71400032,1)) then
+		local lg=Duel.GetMatchingGroup(c71400032.filter2b,tp,LOCATION_MZONE,LOCATION_MZONE,nil)
+		if lg:GetCount()>0 and lg:GetSum(Card.GetLink)>=4 and g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(71400032,1)) then
 			Duel.BreakEffect()
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 			local sg=g:Select(tp,1,1,nil)
@@ -69,9 +81,6 @@ end
 function c71400032.filter2(c)
 	return c:IsRace(RACE_PLANT) and aux.NegateMonsterFilter(c)
 end
-function c71400032.filter2con(c)
-	return c:IsFaceup() and c:IsRace(RACE_PLANT)
-end
 function c71400032.filter2a(c)
 	return c:IsSetCard(0xd714) and c:IsAbleToHand()
 end

expansions/script/c71400034.lua

@@ -58,15 +58,14 @@ function c71400034.op1(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c71400034.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c71400034.filter2c,tp,LOCATION_HAND,0,1,nil) end
-	Duel.DiscardHand(tp,c71400034.filter2c,1,1,REASON_COST+REASON_DISCARD,nil)
+	if chk==0 then return Duel.IsExistingMatchingCard(c71400034.filter2c,tp,LOCATION_HAND+LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil) end
+	Duel.DiscardHand(tp,c71400034.filter2c,1,1,REASON_COST,nil)
 end
 function c71400034.filter2c(c)
-	return c:IsSetCard(0x7714) and c:IsType(TYPE_FIELD) and c:IsDiscardable()
+	return c:IsSetCard(0x7714) and c:IsType(TYPE_FIELD) and c:IsAbleToDeckAsCost()
 end
 function c71400034.con2(e,tp,eg,ep,ev,re,r,rp)
-	return re:GetHandler():IsOnField() and re:GetHandler():IsRelateToEffect(re) and (re:IsActiveType(TYPE_MONSTER)
-		or (re:IsActiveType(TYPE_SPELL+TYPE_TRAP) and not re:IsHasType(EFFECT_TYPE_ACTIVATE)))
+	return re:IsActiveType(TYPE_MONSTER)
 end
 function c71400034.filter2(c)
 	return c:IsSetCard(0x714) and c:IsType(TYPE_LINK) and c:IsFaceup()
@@ -75,13 +74,16 @@ function c71400034.filter2b(c,tp)
 	return c:IsAbleToRemove(tp) and not c71400034.filter2(c)
 end
 function c71400034.tg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return re:GetHandler():IsAbleToDeck() end
-	Duel.SetOperationInfo(0,CATEGORY_TODECK,eg,1,0,0)
+	rc=re:GetHandler()
+	if chk==0 then return rc:IsRelateToEffect(re) and rc:IsAbleToDeck() end
+	Duel.SetOperationInfo(0,CATEGORY_TODECK,rc,1,0,0)
 end
 function c71400034.op2(e,tp,eg,ep,ev,re,r,rp)
-	if re:GetHandler():IsRelateToEffect(re) and Duel.SendtoDeck(eg,nil,2,REASON_EFFECT)==1 then
-		local g=Duel.GetMatchingGroup(c71400034.filter2b,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil,tp)
-		if Duel.IsExistingMatchingCard(c71400034.filter2,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) and g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(71400034,2)) then
+	local rc=re:GetHandler()
+	if rc:IsRelateToEffect(re) and Duel.SendtoDeck(rc,nil,2,REASON_EFFECT)==1 then
+		local g=Duel.GetMatchingGroup(c71400034.filter2b,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,e:GetHandler(),tp)
+		local lg=Duel.GetMatchingGroup(c71400034.filter2,tp,LOCATION_MZONE,LOCATION_MZONE,nil)
+		if lg:GetCount()>0 and lg:GetSum(Card.GetLink)>=4 and g:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(71400034,2)) then
 			Duel.BreakEffect()
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 			local sg=g:Select(tp,1,1,nil)

expansions/script/c71400059.lua

@@ -31,7 +31,6 @@ function c71400059.op1(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_XYZ_LEVEL)
-	e1:SetProperty(EFFECT_FLAG_IGNORE_IMMUNE)
 	e1:SetTargetRange(LOCATION_MZONE,LOCATION_MZONE)
 	e1:SetTarget(c71400059.xyztg)
 	e1:SetValue(c71400059.xyzlv)

expansions/script/c71400069.lua

@@ -13,6 +13,7 @@ function c71400069.initial_effect(c)
 	c:RegisterEffect(e1)
 	--to grave
 	local e2=Effect.CreateEffect(c)
+	e2:SetDescription(aux.Stringid(71400069,1))
 	e2:SetCategory(CATEGORY_TOGRAVE)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetCode(EVENT_FREE_CHAIN)