Merge pull request #17 from Sonic714/master

23.5.24 yume upd

expansions/script/c71400001.lua

@@ -166,23 +166,6 @@ function yume.AddYumeFieldGlobal(c,id,ft)
 	eac:SetCode(EVENT_FREE_CHAIN)
 	eac:SetCountLimit(1,id+EFFECT_COUNT_CODE_OATH)
 	c:RegisterEffect(eac)
-	--[[
-	--self to deck
-	local esd1=Effect.CreateEffect(c)
-	esd1:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
-	esd1:SetCode(EVENT_CHAINING)
-	esd1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	esd1:SetRange(LOCATION_FZONE)
-	esd1:SetOperation(aux.chainreg)
-	c:RegisterEffect(esd1)
-	local esd2=Effect.CreateEffect(c)
-	esd2:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
-	esd2:SetCode(EVENT_CHAIN_SOLVED)
-	esd2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	esd2:SetRange(LOCATION_FZONE)
-	esd2:SetOperation(yume.SelfToDeckOp)
-	c:RegisterEffect(esd2)
-	--]]
 	--activate field
 	local efa=Effect.CreateEffect(c)
 	efa:SetDescription(aux.Stringid(71400001,2))
@@ -195,15 +178,6 @@ function yume.AddYumeFieldGlobal(c,id,ft)
 	efa:SetOperation(yume.ActivateFieldOp)
 	c:RegisterEffect(efa)
 end
---[[
---Self To Deck
-function yume.SelfToDeckOp(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	if not re:GetHandler():IsSetCard(0x714) and rp==tp and c:GetFlagEffect(1)>0 then
-		Duel.SendtoDeck(c,nil,2,REASON_EFFECT)
-	end
-end
---]]
 function yume.AddYumeWeaponGlobal(c)
 	--set
 	local e1=Effect.CreateEffect(c)
@@ -291,7 +265,8 @@ function yume.ActivateFieldCon(e,tp,eg,ep,ev,re,r,rp)
 end
 function yume.ActivateFieldOp(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	local id=yume.temp_card_field[c].id
+	--local id=yume.temp_card_field[c].id
+	local id=0
 	local ft=yume.temp_card_field[c].ft
 	yume.ActivateYumeField(e,tp,id,ft,LOCATION_DECK+LOCATION_HAND)
 end

expansions/script/c71400014.lua

@@ -19,10 +19,12 @@ function c71400014.initial_effect(c)
 	--heart
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(71400014,1))
-	e2:SetType(EFFECT_TYPE_QUICK_O)
-	e2:SetCode(EVENT_FREE_CHAIN)
+	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+	e2:SetCode(EVENT_CHAINING)
 	e2:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e2:SetRange(LOCATION_FZONE)
+	e2:SetProperty(EFFECT_FLAG_DELAY)
+	e2:SetCondition(c71400014.con2)
 	e2:SetCost(c71400014.cost2)
 	e2:SetTarget(c71400014.tg2)
 	e2:SetOperation(c71400014.op2)
@@ -63,7 +65,7 @@ function c71400014.op1(e,tp,eg,ep,ev,re,r,rp)
 	Duel.RegisterEffect(e1,rp)
 end
 function c71400014.aclimit(e,re,tp)
-	return not re:IsActiveType(TYPE_TRAP)
+	return not (re:IsActiveType(TYPE_TRAP) or re:GetHandler():IsSetCard(0x714) and re:IsActiveType(TYPE_FIELD))
 end
 function c71400014.con1(e,tp,eg,ep,ev,re,r,rp)
 	return re:IsActiveType(TYPE_TRAP) and e:GetHandler():GetFlagEffect(1)~=0 and Duel.GetFlagEffect(tp,71400014)==0
@@ -71,9 +73,12 @@ end
 function c71400014.filter2(c,e,tp)
 	return c:IsSetCard(0x714) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
+function c71400014.con2(e,tp,eg,ep,ev,re,r,rp)
+	return re:IsActiveType(TYPE_TRAP) and e:GetHandler():IsStatus(STATUS_EFFECT_ENABLED)
+end
 function c71400014.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.CheckLPCost(tp,1000) end
-	Duel.PayLPCost(tp,1000)
+	if chk==0 then return Duel.CheckLPCost(tp,2000) end
+	Duel.PayLPCost(tp,2000)
 end
 function c71400014.filter2(c)
 	return c:IsXyzSummonable(nil) and c:IsSetCard(0x714)
@@ -104,7 +109,7 @@ function c71400014.regop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetCode(EFFECT_UPDATE_ATTACK)
 	e1:SetDescription(aux.Stringid(71400014,1))
-	e1:SetValue(1000)
+	e1:SetValue(2000)
 	e1:SetProperty(EFFECT_FLAG_CLIENT_HINT)
 	e1:SetReset(RESET_EVENT+0xff0000)
 	c:RegisterEffect(e1)

expansions/script/c71400015.lua

@@ -6,7 +6,7 @@ function c71400015.initial_effect(c)
 	--to hand
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(71400015,0))
-	e1:SetCategory(CATEGORY_TOHAND)
+	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_TOGRAVE)
 	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_FZONE)
@@ -30,6 +30,12 @@ end
 function c71400015.filter1(c)
 	return c:IsSetCard(0xe714) and c:IsAbleToHand()
 end
+function c71400015.filter1a(c)
+	return c:IsSetCard(0x714) and (c:IsType(TYPE_TUNER) or c:IsAttribute(ATTRIBUTE_WATER)) and c:IsLevelAbove(1) and c:IsFaceup()
+end
+function c71400015.filter1b(c)
+	return c:IsSetCard(0xe714) and c:IsAbleToGrave()
+end
 function c71400015.target1(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c71400015.filter1(chkc) end
 	if chk==0 then return Duel.IsExistingTarget(c71400015.filter1,tp,LOCATION_GRAVE,0,1,nil) end
@@ -39,8 +45,13 @@ function c71400015.target1(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 end
 function c71400015.operation1(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
-	if tc:IsRelateToEffect(e) then
-		Duel.SendtoHand(tc,nil,REASON_EFFECT)
+	if tc:IsRelateToEffect(e) and Duel.SendtoHand(tc,nil,REASON_EFFECT)>0 and tc:IsLocation(LOCATION_HAND) and Duel.IsExistingMatchingCard(c71400015.filter1a,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) and Duel.IsExistingMatchingCard(c71400015.filter1b,tp,LOCATION_DECK,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(71400015,2)) then
+		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
+		local g=Duel.SelectMatchingCard(tp,c71400015.filter1b,tp,LOCATION_DECK,0,1,1,nil)
+		if g:GetCount()>0 then
+			Duel.BreakEffect()
+			Duel.SendtoGrave(g,REASON_EFFECT)
+		end
 	end
 end
 function c71400015.target2(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c71400016.lua

@@ -7,11 +7,11 @@ function c71400016.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(71400016,0))
 	e1:SetCategory(CATEGORY_SUMMON)
-	e1:SetType(EFFECT_TYPE_QUICK_O)
+	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e1:SetRange(LOCATION_FZONE)
-	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetCode(EVENT_SUMMON_SUCCESS)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetCountLimit(1)
-	e1:SetCondition(c71400016.con1)
 	e1:SetTarget(c71400016.tg1)
 	e1:SetOperation(c71400016.op1)
 	c:RegisterEffect(e1)
@@ -31,12 +31,14 @@ function c71400016.initial_effect(c)
 	--self to deck & activate field
 	yume.AddYumeFieldGlobal(c,71400016,1)
 end
-function c71400016.con1(e,tp,eg,ep,ev,re,r,rp)
-	local ph=Duel.GetCurrentPhase()
-	return ph==PHASE_MAIN1 or ph==PHASE_MAIN2
+function c71400016.filter1(c,check)
+	return c:IsSetCard(0x714) and (c:IsType(TYPE_TUNER) or check) and c:IsSummonable(true,nil)
 end
-function c71400016.filter1(c)
-	return c:IsSetCard(0x714) and c:IsSummonable(true,nil)
+function c71400016.filter1a(c)
+	return c:IsSetCard(0x714) and c:IsType(TYPE_TUNER)
+end
+function c71400016.filter1b(c)
+	return c:IsSetCard(0x714) and c:IsType(TYPE_SYNCHRO)
 end
 function c71400016.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c71400016.filter1,tp,LOCATION_HAND,0,1,nil) end
@@ -44,8 +46,9 @@ function c71400016.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c71400016.op1(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
+	local check=Duel.IsExistingMatchingCard(c71400016.filter1a,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil) and Duel.IsExistingMatchingCard(c71400016.filter1b,tp,LOCATION_GRAVE,LOCATION_GRAVE,1,nil)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SUMMON)
-	local g=Duel.SelectMatchingCard(tp,c71400016.filter1,tp,LOCATION_HAND,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,c71400016.filter1,tp,LOCATION_HAND,0,1,1,nil,check)
 	local tc=g:GetFirst()
 	if tc then
 		Duel.Summon(tp,tc,true,nil)

expansions/script/c71400030.lua

@@ -45,19 +45,16 @@ end
 function c71400030.filter1(c,e)
 	return c:IsRelateToEffect(e) and c:IsAbleToRemove()
 end
-function c71400030.filter2(c)
-	return c:IsType(TYPE_MONSTER) and c:IsAbleToRemove()
-end
 function c71400030.op1(e,tp,eg,ep,ev,re,r,rp)
 	local g1=eg:Filter(c71400030.filter1,nil,e)
 	if g1:GetCount()>0 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 		local sg1=g1:Select(tp,1,1,nil)
-		local mg=Duel.GetMatchingGroup(c71400030.filter2,tp,LOCATION_MZONE+LOCATION_GRAVE,LOCATION_MZONE+LOCATION_GRAVE,aux.ExceptThisCard(e))
-		mg:Sub(sg1)
-		if mg:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(71400032,1)) then
+		local mg=Duel.GetMatchingGroup(Card.IsAbleToRemove,tp,LOCATION_MZONE+LOCATION_GRAVE,LOCATION_MZONE+LOCATION_GRAVE,aux.ExceptThisCard(e))
+		local g2=mg:Sub(sg1)
+		if g2:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(71400032,1)) then
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-			local sg2=mg:Select(tp,1,2,nil)
+			local sg2=g2:Select(tp,1,2,nil)
 			sg1:Merge(sg2)
 		end
 		Duel.HintSelection(sg1)

expansions/script/c71400032.lua

@@ -16,25 +16,30 @@ function c71400032.initial_effect(c)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(71400032,0))
 	e2:SetCategory(CATEGORY_DISABLE+CATEGORY_SEARCH+CATEGORY_TOHAND+CATEGORY_GRAVE_ACTION)
-	e2:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e2:SetType(EFFECT_TYPE_QUICK_O)
-	e2:SetCode(EVENT_FREE_CHAIN)
+	e2:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
+	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+	e2:SetCode(EVENT_TO_GRAVE)
 	e2:SetRange(LOCATION_FZONE)
-	e2:SetCountLimit(1)
+	e2:SetCountLimit(1,EFFECT_COUNT_CODE_SINGLE)
 	e2:SetCondition(c71400032.con2)
-	e2:SetCost(c71400032.cost2)
+	--e2:SetCost(c71400032.cost2)
 	e2:SetTarget(c71400032.tg2)
 	e2:SetOperation(c71400032.op2)
 	c:RegisterEffect(e2)
+	local e2a=e2:Clone()
+	e2a:SetCode(EVENT_REMOVE)
+	c:RegisterEffect(e2a)
 	--self to deck & activate field
 	yume.AddYumeFieldGlobal(c,71400032,2)
 end
 function c71400032.tg1(e,c)
 	return not c71400032.filter2b(c)
 end
+function c71400032.filter2con(c,tp)
+	return c:IsType(TYPE_QUICKPLAY) or c:IsType(TYPE_COUNTER)
+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 eg:IsExists(c71400032.filter2con,1,nil,tp)
 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)

expansions/script/c71400034.lua

@@ -6,12 +6,13 @@ function c71400034.initial_effect(c)
 	--link summon
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e1:SetType(EFFECT_TYPE_QUICK_O)
-	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+	e1:SetCode(EVENT_CHAINING)
 	e1:SetRange(LOCATION_FZONE)
-	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetDescription(aux.Stringid(71400034,0))
 	e1:SetCountLimit(1)
+	e1:SetCondition(c71400034.con1)
 	e1:SetTarget(c71400034.tg1)
 	e1:SetOperation(c71400034.op1)
 	e1:SetCost(c71400034.cost1)
@@ -19,8 +20,9 @@ function c71400034.initial_effect(c)
 	--todeck
 	local e2=Effect.CreateEffect(c)
 	e2:SetCategory(CATEGORY_TODECK+CATEGORY_REMOVE)
-	e2:SetType(EFFECT_TYPE_QUICK_O)
+	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_CHAINING)
+	e2:SetProperty(EFFECT_FLAG_DELAY)
 	e2:SetRange(LOCATION_FZONE)
 	e2:SetCountLimit(1)
 	e2:SetDescription(aux.Stringid(71400034,1))
@@ -32,6 +34,9 @@ function c71400034.initial_effect(c)
 	--self to deck & activate field
 	yume.AddYumeFieldGlobal(c,71400034,2)
 end
+function c71400034.con1(e,tp,eg,ep,ev,re,r,rp)
+	return re:IsActiveType(TYPE_SPELL) and e:GetHandler():IsStatus(STATUS_EFFECT_ENABLED)
+end
 function c71400034.filter1c(c)
 	return c:IsSetCard(0x714) and c:IsAbleToDeckOrExtraAsCost()
 end
@@ -65,7 +70,7 @@ function c71400034.filter2c(c)
 	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:IsActiveType(TYPE_MONSTER)
+	return re:IsActiveType(TYPE_MONSTER) and e:GetHandler():IsStatus(STATUS_EFFECT_ENABLED)
 end
 function c71400034.filter2(c)
 	return c:IsSetCard(0x714) and c:IsType(TYPE_LINK) and c:IsFaceup()
@@ -74,13 +79,13 @@ 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)
-	rc=re:GetHandler()
-	if chk==0 then return rc:IsRelateToEffect(re) and rc:IsAbleToDeck() end
-	Duel.SetOperationInfo(0,CATEGORY_TODECK,rc,1,0,0)
+	if chk==0 then return Duel.IsExistingMatchingCard(Card.IsAbleToDeck,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil) end
+	local tdg=Duel.GetMatchingGroup(Card.IsAbleToDeck,tp,LOCATION_MZONE,LOCATION_MZONE,nil)
+	Duel.SetOperationInfo(0,CATEGORY_TODECK,tdg,1,0,0)
 end
 function c71400034.op2(e,tp,eg,ep,ev,re,r,rp)
-	local rc=re:GetHandler()
-	if rc:IsRelateToEffect(re) and Duel.SendtoDeck(rc,nil,2,REASON_EFFECT)==1 then
+	local tdg=Duel.SelectMatchingCard(Card.IsAbleToDeck,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
+	if tdg:GetCount()==1 and Duel.SendtoDeck(tdg,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

expansions/script/c71400037.lua

@@ -18,21 +18,29 @@ function c71400037.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c71400037.filter(c,e,tp)
-	return c:IsSetCard(0x714) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return c:IsSetCard(0x714) and c:IsLevel(4) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE)
+end
+function c71400037.filter1a(c)
+	return c:IsSetCard(0x714) and c:IsType(TYPE_XYZ) and (c:IsLocation(LOCATION_GRAVE) or c:IsFaceup())
 end
 function c71400037.tg1(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c71400037.filter(chkc,e,tp) end
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 		and Duel.IsExistingTarget(c71400037.filter,tp,LOCATION_GRAVE,0,1,nil,e,tp) end
+	local tg=1
+	if Duel.IsExistingMatchingCard(c71400037.filter1,tp,LOCATION_MZONE+LOCATION_GRAVE,LOCATION_MZONE+LOCATION_GRAVE,1,nil) then
+		tg=2
+	end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectTarget(tp,c71400037.filter,tp,LOCATION_GRAVE,0,1,1,nil,e,tp)
+	local g=Duel.SelectTarget(tp,c71400037.filter,tp,LOCATION_GRAVE,0,1,tg,nil,e,tp)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,g,1,0,0)
 end
 function c71400037.op1(e,tp,eg,ep,ev,re,r,rp)
-	local tc=Duel.GetFirstTarget()
-	if not tc:IsRelateToEffect(e) then return end
-	if Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP) then
 	local c=e:GetHandler()
+	local g=Duel.GetTargetsRelateToChain()
+	if g:GetCount()==0 then return end
+	for tc in aux.Next(g) do
+		if Duel.SpecialSummonStep(tc,0,tp,tp,false,false,POS_FACEUP_DEFENSE) then
 			local e1=Effect.CreateEffect(c)
 			e1:SetDescription(aux.Stringid(71400037,1))
 			e1:SetType(EFFECT_TYPE_SINGLE)
@@ -64,6 +72,7 @@ function c71400037.op1(e,tp,eg,ep,ev,re,r,rp)
 			e5:SetCode(EVENT_BE_BATTLE_TARGET)
 			c:RegisterEffect(e5,true)
 		end
+	end
 	Duel.SpecialSummonComplete()
 end
 function c71400037.tgcon(e,tp,eg,ep,ev,re,r,rp)

expansions/script/c71400041.lua

@@ -8,10 +8,9 @@ function c71400041.initial_effect(c)
 	--to grave
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_TOGRAVE)
-	e1:SetType(EFFECT_TYPE_QUICK_O)
-	e1:SetProperty(EFFECT_FLAG_CARD_TARGET)
-	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_SSET+TIMING_BATTLE_START+TIMING_MAIN_END+TIMING_BATTLE_END)
+	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+	e1:SetProperty(EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DELAY)
+	e1:SetCode(EVENT_SUMMON_SUCCESS)
 	e1:SetRange(LOCATION_FZONE)
 	e1:SetTarget(c71400041.tg1)
 	e1:SetDescription(aux.Stringid(71400041,0))
@@ -19,6 +18,12 @@ function c71400041.initial_effect(c)
 	e1:SetCondition(c71400041.con1)
 	e1:SetOperation(c71400041.op1)
 	c:RegisterEffect(e1)
+	local e1a=e1:Clone()
+	e1a:SetCode(EVENT_FLIP_SUMMON_SUCCESS)
+	c:RegisterEffect(e1a)
+	local e1b=e1:Clone()
+	e1b:SetCode(EVENT_SPSUMMON_SUCCESS)
+	c:RegisterEffect(e1b)
 end
 function c71400041.con1(e,tp,eg,ep,ev,re,r,rp)
 	local ph=Duel.GetCurrentPhase()

expansions/script/c71400042.lua

@@ -15,9 +15,9 @@ function c71400042.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_TOGRAVE+CATEGORY_SEARCH+CATEGORY_TOHAND+CATEGORY_GRAVE_ACTION)
 	e1:SetCountLimit(1)
-	e1:SetType(EFFECT_TYPE_QUICK_O)
-	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_SSET+TIMING_BATTLE_START+TIMING_END_PHASE)
+	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
+	e1:SetCode(EVENT_CHAINING)
 	e1:SetRange(LOCATION_FZONE)
 	e1:SetTarget(c71400042.tg1)
 	e1:SetDescription(aux.Stringid(71400042,0))

expansions/script/c71400047.lua

@@ -5,6 +5,7 @@ function c71400047.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetCountLimit(1,71400047+EFFECT_COUNT_CODE_OATH)
 	e1:SetDescription(aux.Stringid(71400047,0))
 	e1:SetCondition(c71400047.con1)
 	e1:SetOperation(c71400047.op1)

expansions/script/c71400049.lua

@@ -8,15 +8,22 @@ function c71400049.initial_effect(c)
 	--synchro summon
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(71400049,0))
-	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_DESTROY+CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE)
-	e1:SetType(EFFECT_TYPE_QUICK_O)
-	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetCategory(CATEGORY_SPECIAL_SUMMON+CATEGORY_ATKCHANGE+CATEGORY_DEFCHANGE)
+	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
+	e1:SetCode(EVENT_DESTROYED)
 	e1:SetRange(LOCATION_FZONE)
-	e1:SetCountLimit(1)
+	e1:SetCountLimit(1,EFFECT_COUNT_CODE_SINGLE)
+	e1:SetCondition(c71400049.con1)
 	e1:SetTarget(c71400049.tg1)
 	e1:SetCost(c71400049.cost1)
 	e1:SetOperation(c71400049.op1)
 	c:RegisterEffect(e1)
+	local e1a=e1:Clone()
+	e1a:SetCode(EVENT_PHASE+PHASE_BATTLE)
+	e1a:SetProperty(0)
+	e1a:SetCondition(c71400049.con1a)
+	c:RegisterEffect(e1a)
 	--special summon
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(71400049,1))
@@ -28,38 +35,45 @@ function c71400049.initial_effect(c)
 	e2:SetTarget(c71400049.tg2)
 	e2:SetOperation(c71400049.op2)
 	c:RegisterEffect(e2)
+	if not c71400049.global_check then
+		c71400049.global_check=true
+		local ge1=Effect.CreateEffect(c)
+		ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+		ge1:SetCode(EVENT_BATTLE_DESTROYED)
+		ge1:SetOperation(c71400049.checkop)
+		Duel.RegisterEffect(ge1,0)
+	end
 end
 c71400049.toss_dice=true
+function c71400049.checkop(e,tp,eg,ep,ev,re,r,rp)
+	Duel.RegisterFlagEffect(0,71400049,RESET_PHASE+PHASE_END,0,1)
+end
+function c71400049.filter1con(c)
+	return c:IsType(TYPE_MONSTER) and c:IsReason(REASON_EFFECT)
+end
+function c71400049.con1(e,tp,eg,ep,ev,re,r,rp)
+	return eg:IsExists(c71400049.filter1con,1,nil)
+end
+function c71400049.con1a(e,tp,eg,ep,ev,re,r,rp)
+	return Duel.GetFlagEffect(0,71400049)>0
+end
 function c71400049.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 c71400049.filter1(c)
+	return c:IsSetCard(0x714) and c:IsSynchroSummonable(nil)
+end
 function c71400049.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c71400049.filter1des,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,tp) end
+	if chk==0 then return Duel.IsExistingMatchingCard(c71400049.filter1,tp,LOCATION_EXTRA,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
-	Duel.SetOperationInfo(0,CATEGORY_DESTROY,nil,1,tp,LOCATION_MZONE)
-end
-function c71400049.filter1des(c,tp)
-	local mg=Duel.GetMatchingGroup(Card.IsFaceup,tp,LOCATION_MZONE,LOCATION_MZONE,c)
-	if mg:IsExists(Card.GetHandSynchro,1,nil) then
-		local mg2=Duel.GetMatchingGroup(nil,tp,LOCATION_HAND,0,nil)
-		if mg2:GetCount()>0 then mg:Merge(mg2) end
-	end
-	return Duel.IsExistingMatchingCard(c71400049.filter1sp,tp,LOCATION_EXTRA,0,1,nil,mg)
-end
-function c71400049.filter1sp(c,mg)
-	return c:IsSetCard(0x714) and c:IsSynchroSummonable(nil,mg)
 end
 function c71400049.op1(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
-	local dg=Duel.SelectMatchingCard(aux.TRUE,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil)
-	if dg:GetCount()>0 and Duel.Destroy(dg,REASON_EFFECT)>0 then
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-		local sg=Duel.SelectMatchingCard(c71400049.filter1sp,tp,LOCATION_EXTRA,0,1,1,nil,nil)
+	local sg=Duel.SelectMatchingCard(c71400049.filter1,tp,LOCATION_EXTRA,0,1,1,nil)
 	if sg:GetCount()>0 then
 		Duel.SynchroSummon(tp,tc,nil)
 	end
-	end
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_SET_ATTACK_FINAL)
@@ -75,46 +89,6 @@ end
 function c71400049.atktg(e,c)
 	return c:IsSetCard(0x714) and c:IsType(TYPE_SYNCHRO)
 end
---[[
-function c71400049.op1(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local g=Duel.GetMatchingGroup(c71400049.filter1,tp,LOCATION_EXTRA,0,nil)
-	if g:GetCount()>0 then
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-		local sg=g:Select(tp,1,1,nil)
-		local tc=sg:GetFirst()
-		Duel.SynchroSummon(tp,tc,nil)
-		local e1=Effect.CreateEffect(c)
-		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetCode(EFFECT_SPSUMMON_COST)
-		e1:SetOperation(c71400049.regop)
-		e1:SetLabelObject(c)
-		tc:RegisterEffect(e1)
-	end
-end
-function c71400049.regop(e,tp,eg,ep,ev,re,r,rp)
-	local c=e:GetHandler()
-	local lc=e:GetLabelObject()
-	local e1=Effect.CreateEffect(lc)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
-	e1:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD)
-	e1:SetOperation(c71400049.sumop)
-	c:RegisterEffect(e1)
-	local e2=Effect.CreateEffect(lc)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetCode(EFFECT_CANNOT_DISABLE_SPSUMMON)
-	e2:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD)
-	c:RegisterEffect(e2)
-	e:Reset()
-end
-function c71400049.sumop(e,tp,eg,ep,ev,re,r,rp)
-	Duel.SetChainLimitTillChainEnd(c71400049.chainlm)
-end
-function c71400049.chainlm(e,rp,tp)
-	return aux.ExceptThisCard(e)
-end
---]]
 function c71400049.filter2(c,e,tp)
 	return c:IsSetCard(0x714) and c:IsType(TYPE_SYNCHRO) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_SYNCHRO,tp,false,false) and Duel.GetLocationCountFromEx(tp,tp,nil,c)>0
 end

expansions/script/c71400058.lua

@@ -6,15 +6,24 @@ function c71400058.initial_effect(c)
 	--xyz summon
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
-	e1:SetType(EFFECT_TYPE_QUICK_O)
-	e1:SetCode(EVENT_FREE_CHAIN)
+	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
+	e1:SetCode(EVENT_SUMMON_SUCCESS)
 	e1:SetRange(LOCATION_FZONE)
 	e1:SetDescription(aux.Stringid(71400058,0))
-	e1:SetCountLimit(1)
+	e1:SetCountLimit(1,EFFECT_COUNT_CODE_SINGLE)
+	e1:SetCondition(c71400058.con1)
 	e1:SetTarget(c71400058.tg1)
 	e1:SetOperation(c71400058.op1)
 	e1:SetCost(c71400058.cost1)
 	c:RegisterEffect(e1)
+	local e1a=e1:Clone()
+	e1a:SetCode(EVENT_SPSUMMON_SUCCESS)
+	c:RegisterEffect(e1a)
+	local e1b=e1:Clone()
+	e1b:SetCode(EVENT_CHAINING)
+	e1b:SetCondition(c71400058.con1b)
+	c:RegisterEffect(e1b)
 	--material
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(71400058,1))
@@ -22,21 +31,34 @@ function c71400058.initial_effect(c)
 	e2:SetCode(EVENT_PHASE+PHASE_END)
 	e2:SetRange(LOCATION_FZONE)
 	e2:SetCountLimit(1)
-	e2:SetCondition(c71400058.con2)
+	--e2:SetCondition(c71400058.con2)
 	e2:SetTarget(c71400058.tg2)
 	e2:SetOperation(c71400058.op2)
 	c:RegisterEffect(e2)
 	--activate field
 	yume.AddYumeFieldGlobal(c,71400058,1)
 end
+function c71400058.filtercon1a(c,tp)
+	return c:IsFaceup() and c:IsAttribute(ATTRIBUTE_WATER)
+end
+function c71400058.con1(e,tp,eg,ep,ev,re,r,rp)
+	return eg:IsExists(c71400058.filtercon1,1,nil,tp)
+end
+function c71400058.con1b(e,tp,eg,ep,ev,re,r,rp)
+	local attr=Duel.GetChainInfo(ev,CHAININFO_TRIGGERING_ATTRIBUTE)
+	return re:IsActiveType(TYPE_MONSTER) and attr&ATTRIBUTE_WATER>0
+end
 function c71400058.filterc1(c)
 	return c:IsSetCard(0xb714) and c:IsType(TYPE_FIELD) and c:IsAbleToGraveAsCost()
 end
 function c71400058.cost1(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c71400058.filterc1,tp,LOCATION_DECK,0,1,nil) end
+	local g=Duel.GetMatchingGroup(c71400058.filterc1,tp,LOCATION_DECK,0,nil)
+	local ct=g:GetClassCount(Card.GetCode)
+	if ct>4 then ct=4 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-	local g=Duel.SelectMatchingCard(tp,c71400058.filterc1,tp,LOCATION_DECK,0,1,1,nil)
-	Duel.SendtoGrave(g,REASON_COST)
+	local sg=g:SelectSubGroup(tp,aux.dncheck,false,1,ct)
+	Duel.SendtoGrave(sg,REASON_COST)
 end
 function c71400058.filter1(c)
 	return c:IsSetCard(0x714) and c:IsXyzSummonable(nil)

expansions/script/c71400059.lua

@@ -18,7 +18,7 @@ function c71400059.initial_effect(c)
 	e3:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e3:SetDescription(aux.Stringid(71400059,1))
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e3:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET)
+	e3:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CARD_TARGET+EFFECT_FLAG_DAMAGE_STEP)
 	e3:SetCode(EVENT_LEAVE_FIELD)
 	e3:SetCountLimit(1,71500059)
 	e3:SetRange(LOCATION_GRAVE)

expansions/script/c71400070.lua

@@ -21,7 +21,7 @@ function c71400070.initial_effect(c)
 	e3:SetCategory(CATEGORY_TOGRAVE)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e3:SetCode(EVENT_SPSUMMON_SUCCESS)
-	e3:SetProperty(EFFECT_FLAG_DELAY)
+	e3:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_DAMAGE_STEP)
 	e3:SetRange(LOCATION_GRAVE)
 	e3:SetCountLimit(1,71500070)
 	e3:SetLabelObject(e0)
@@ -76,8 +76,11 @@ function c71400070.tg3(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c71400070.op3(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-	local g=Duel.SelectMatchingCard(tp,c71400070.filter3,tp,LOCATION_DECK,0,1,1,nil)
-	if g:GetCount()>0 then
-		Duel.SendtoGrave(g,REASON_EFFECT)
+	local g=Duel.GetMatchingGroup(c71400070.filter3,tp,LOCATION_DECK,0,nil)
+	local ct=g:GetClassCount(Card.GetCode)
+	if ct>2 then ct=2 end
+	local sg=g:SelectSubGroup(tp,aux.dncheck,false,1,ct)
+	if sg:GetCount()>0 then
+		Duel.SendtoGrave(sg,REASON_EFFECT)
 	end
 end
\ No newline at end of file

expansions/script/c71401001.lua

@@ -56,6 +56,18 @@ function c71401001.op1(e,tp,eg,ep,ev,re,r,rp)
 	if c:IsRelateToEffect(e) then
 		Duel.SpecialSummon(c,0,tp,tp,false,false,POS_FACEUP)
 	end
+	local e1=Effect.CreateEffect(c)
+	e1:SetType(EFFECT_TYPE_FIELD)
+	e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE)
+	e1:SetCode(EFFECT_TO_GRAVE_REDIRECT)
+	e1:SetTargetRange(0xff,0xfe)
+	e1:SetValue(LOCATION_REMOVED)
+	e1:SetReset(RESET_PHASE+PHASE_END)
+	e1:SetTarget(c71401001.rmtg)
+	Duel.RegisterEffect(e1,tp)
+end
+function c71401001.rmtg(e,c)
+	return c:GetOwner()==e:GetHandlerPlayer()
 end
 function c71401001.filter2ext(c)
 	return c:IsFaceup() and c:IsType(TYPE_CONTINUOUS)

expansions/script/c71401002.lua

@@ -39,7 +39,7 @@ function c71401002.op2(e,tp,eg,ep,ev,re,r,rp)
 	if tc then
 		local b1=tc:IsAbleToHand()
 		local b2=not tc:IsForbidden() and tc:CheckUniqueOnField(tp)
-		if b1 and (not b2 or Duel.SelectOption(tp,1152,aux.Stringid(71401002,1))==0) then
+		if b1 and (not b2 or Duel.SelectOption(tp,1150,aux.Stringid(71401002,1))==0) then
 			Duel.SendtoHand(tc,nil,REASON_EFFECT)
 			Duel.ConfirmCards(1-tp,tc)
 		else

expansions/script/c71401003.lua

@@ -9,7 +9,7 @@ function c71401003.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetRange(LOCATION_SZONE)
 	e2:SetCode(EVENT_FREE_CHAIN)
-	e2:SetHintTiming(0,TIMING_END_PHASE)
+	e2:SetHintTiming(0,TIMINGS_CHECK_MONSTER)
 	e2:SetCountLimit(1,71501003)
 	e2:SetCondition(c71401003.con2)
 	e2:SetCost(c71401003.cost2)
@@ -35,7 +35,7 @@ function c71401003.filter2(c)
 	return c:IsRace(RACE_SPELLCASTER) and c:IsAttribute(ATTRIBUTE_LIGHT) and (c:IsLocation(LOCATION_GRAVE) or c:IsFaceup()) and (c:IsAbleToHand() or not c:IsForbidden() and c:CheckUniqueOnField(tp))
 end
 function c71401003.tg2(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(c71401003.filter2,tp,LOCATION_DECK,0,1,nil) end
+	if chk==0 then return Duel.IsExistingMatchingCard(c71401003.filter2,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,1,nil) end
 	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_GRAVE+LOCATION_REMOVED)
 end
 function c71401003.filter2a(c)

expansions/script/c71401004.lua

@@ -26,6 +26,7 @@ function c71401004.initial_effect(c)
 	e2:SetDescription(aux.Stringid(71401004,1))
 	e2:SetCategory(CATEGORY_REMOVE)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
+	e2:SetProperty(EFFECT_FLAG_DELAY)
 	e2:SetCode(EVENT_LEAVE_FIELD)
 	e2:SetCountLimit(1,71501004)
 	e2:SetCondition(c71401004.con2)
@@ -87,7 +88,7 @@ function c71401004.op2(e,tp,eg,ep,ev,re,r,rp)
 	if g:GetCount()>0 then
 		Duel.Remove(g,POS_FACEUP,REASON_EFFECT)
 	end
-	local e1=Effect.CreateEffect(c)
+	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
 	e1:SetCode(EFFECT_INDESTRUCTABLE_BATTLE)
 	e1:SetTargetRange(LOCATION_MZONE,0)

expansions/script/c71401005.lua

@@ -19,7 +19,7 @@ function c71401005.initial_effect(c)
 	yume.ButterflyCounter()
 end
 function c71401005.con2(e,tp,eg,ep,ev,re,r,rp)
-	return re:IsActiveType(TYPE_MONSTER) and e:GetHandler():GetType()==TYPE_SPELL+TYPE_CONTINUOUS
+	return e:GetHandler():GetType()==TYPE_SPELL+TYPE_CONTINUOUS
 end
 function c71401005.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetCustomActivityCount(71401001,tp,ACTIVITY_CHAIN)==0 end

expansions/script/c71401006.lua

@@ -21,7 +21,7 @@ function c71401006.con2(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetType()==TYPE_TRAP+TYPE_CONTINUOUS
 end
 function c71401006.filterc2(c)
-	return (c:IsLocation(LOCATION_GRAVE) or c:IsFaceup()) and c:IsRace(RACE_SPELLCASTER) and c:IsAbleToRemoveAsCost()
+	return (c:IsLocation(LOCATION_GRAVE) or c:IsFaceup()) and c:IsRace(RACE_SPELLCASTER) and c:IsAbleToDeckOrExtraAsCost()
 end
 function c71401006.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c71401006.filterc2,tp,LOCATION_GRAVE+LOCATION_REMOVED,0,2,nil) and Duel.GetCustomActivityCount(71401001,tp,ACTIVITY_CHAIN)==0 end

expansions/script/c71401007.lua

@@ -21,6 +21,7 @@ function c71401007.initial_effect(c)
 	e2:SetCategory(CATEGORY_REMOVE+CATEGORY_DRAW+CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e2:SetCode(EVENT_REMOVE)
+	e2:SetProperty(EFFECT_FLAG_DELAY)
 	e2:SetCountLimit(1,71501007)
 	e2:SetCost(c71401007.cost2)
 	e2:SetTarget(c71401007.tg2)
@@ -63,7 +64,7 @@ function c71401007.filter2(c,e,tp)
 	return c:IsLevel(4) and c:IsRace(RACE_SPELLCASTER) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 function c71401007.op2(e,tp,eg,ep,ev,re,r,rp)
-	Duel.Hint(HINT_SELECTMSG,tp,CATEGORY_REMOVE)
+	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
 	local g=Duel.SelectMatchingCard(tp,Card.IsAbleToRemove,tp,LOCATION_HAND,0,1,2,nil)
 	if g:GetCount()==0 then return end
 	Duel.Remove(g,POS_FACEUP,REASON_EFFECT)

expansions/script/c71401008.lua

@@ -4,14 +4,14 @@ function c71401008.initial_effect(c)
 	--synchro summon
 	aux.AddSynchroProcedure(c,aux.FilterBoolFunction(Card.IsRace,RACE_SPELLCASTER),aux.NonTuner(Card.IsRace,RACE_SPELLCASTER),1)
 	c:EnableReviveLimit()
-	--remove
+	--indestructable
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetProperty(EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_IGNORE_RANGE+EFFECT_FLAG_IGNORE_IMMUNE)
-	e1:SetCode(EFFECT_TO_GRAVE_REDIRECT)
+	e1:SetCode(EFFECT_INDESTRUCTABLE_EFFECT)
 	e1:SetRange(LOCATION_MZONE)
-	e1:SetTargetRange(0xff,0xff)
-	e1:SetValue(LOCATION_REMOVED)
+	e1:SetTargetRange(LOCATION_SZONE,0)
+	e1:SetTarget(c71401008.indtg)
+	e1:SetValue(1)
 	c:RegisterEffect(e1)
 	--place
 	local e2=Effect.CreateEffect(c)
@@ -37,6 +37,9 @@ function c71401008.initial_effect(c)
 	c:RegisterEffect(e3)
 	yume.ButterflyCounter()
 end
+function c71401008.indtg(e,c)
+	return c:GetOriginalType()&TYPE_MONSTER~=0
+end
 function c71401008.filterc2(c,tp)
 	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsAbleToRemoveAsCost()
 		and (c:IsLocation(LOCATION_SZONE) or Duel.GetLocationCount(tp,LOCATION_SZONE)>0) and Duel.IsExistingMatchingCard(c71401008.filter2,tp,LOCATION_DECK,0,1,nil,c,tp)
@@ -51,7 +54,7 @@ function c71401008.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.Remove(g,POS_FACEUP,REASON_COST)
 	yume.RegButterflyCostLimit(e,tp)
 end
-function c71401008.op1(e,tp,eg,ep,ev,re,r,rp)
+function c71401008.op2(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOFIELD)
 	local tc=Duel.SelectMatchingCard(tp,c71401008.filter2,tp,LOCATION_DECK,0,1,1,nil,nil,tp):GetFirst()

expansions/script/c71401009.lua

@@ -21,7 +21,6 @@ function c71401009.initial_effect(c)
 	e2:SetHintTiming(0,TIMING_END_PHASE+TIMING_EQUIP)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1,71401009)
-	e2:SetCondition(c71401009.con2)
 	e2:SetCost(c71401009.cost2)
 	e2:SetTarget(c71401009.tg2)
 	e2:SetOperation(c71401009.op2)
@@ -49,9 +48,6 @@ end
 function c71401009.atkval(e,c)
 	return Duel.GetMatchingGroupCount(c71401009.atkfilter,0,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)*200
 end
-function c71401009.con2(e,tp,eg,ep,ev,re,r,rp)
-	return Duel.GetCurrentPhase()==PHASE_MAIN1 or Duel.GetCurrentPhase()==PHASE_MAIN2
-end
 function c71401009.cost2(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) and Duel.GetCustomActivityCount(71401001,tp,ACTIVITY_CHAIN)==0 end
 	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
@@ -68,10 +64,11 @@ function c71401009.op2(e,tp,eg,ep,ev,re,r,rp)
 	local g=Duel.GetMatchingGroup(c71401009.filter2,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,nil)
 	if g:GetCount()>0 then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVE)
-		local sg=g:Select(tp,1,1,nil)
+		local sg=g:Select(tp,1,2,nil)
 		Duel.HintSelection(sg)
 		Duel.Remove(sg,POS_FACEUP,REASON_EFFECT)
 		local c=e:GetHandler()
+		--[[
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_FIELD)
 		e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
@@ -84,6 +81,7 @@ function c71401009.op2(e,tp,eg,ep,ev,re,r,rp)
 			e1:SetReset(RESET_PHASE+PHASE_MAIN2)
 		end
 		Duel.RegisterEffect(e1,1-tp)
+		--]]
 		if c:IsRelateToEffect(e) and not c:IsImmuneToEffect(e) and Duel.GetLocationCount(tp,LOCATION_SZONE)>0
 		and Duel.SelectYesNo(tp,aux.Stringid(71401009,2)) then
 			Duel.BreakEffect()