merge

script/c11109820.lua

@@ -11,13 +11,15 @@ function c11109820.initial_effect(c)
 	e1:SetOperation(c11109820.operation)
 	c:RegisterEffect(e1)
 end
-function c11109820.filter1(c,e,tp)
+function c11109820.filter1(c,e,tp,ft)
+	if c:IsControler(tp) then ft=ft+1 end
 	return c:IsFaceup() and c:IsType(TYPE_XYZ)
-		and Duel.IsExistingTarget(c11109820.filter2,tp,LOCATION_MZONE,0,1,nil,e,tp,c:GetRank())
+		and Duel.IsExistingTarget(c11109820.filter2,tp,LOCATION_MZONE,LOCATION_MZONE,1,c,e,tp,c:GetRank(),ft)
 end
-function c11109820.filter2(c,e,tp,rk)
+function c11109820.filter2(c,e,tp,rk,ft)
+	if c:IsControler(tp) then ft=ft+1 end
 	return c:IsFaceup() and c:IsType(TYPE_XYZ)
-		and Duel.IsExistingMatchingCard(c11109820.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp,rk+c:GetRank())
+		and ft>0 and Duel.IsExistingMatchingCard(c11109820.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp,rk+c:GetRank())
 end
 function c11109820.spfilter(c,e,tp,rk)
 	local crk=c:GetRank()
@@ -25,23 +27,28 @@ function c11109820.spfilter(c,e,tp,rk)
 end
 function c11109820.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return false end
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>-1
-		and Duel.IsExistingTarget(c11109820.filter1,tp,LOCATION_MZONE,0,1,nil,e,tp) end
+	local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
+	if chk==0 then return Duel.IsExistingTarget(c11109820.filter1,tp,LOCATION_MZONE,LOCATION_MZONE,1,nil,e,tp,ft) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-	local g1=Duel.SelectTarget(tp,c11109820.filter1,tp,LOCATION_MZONE,0,1,1,nil,e,tp)
+	local g1=Duel.SelectTarget(tp,c11109820.filter1,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,nil,e,tp,ft)
+	local tc=g1:GetFirst()
+	if tc:IsControler(tp) then ft=ft+1 end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-	local g2=Duel.SelectTarget(tp,c11109820.filter2,tp,LOCATION_MZONE,0,1,1,nil,e,tp,g1:GetFirst():GetRank())
+	local g2=Duel.SelectTarget(tp,c11109820.filter2,tp,LOCATION_MZONE,LOCATION_MZONE,1,1,tc,e,tp,tc:GetRank(),ft)
 	g1:Merge(g2)
 	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,g1,2,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
 function c11109820.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if Duel.GetLocationCount(tp,LOCATION_MZONE)<0 then return end
 	local g=Duel.GetChainInfo(0,CHAININFO_TARGET_CARDS)
 	local tc1=g:GetFirst()
 	local tc2=g:GetNext()
 	if not tc1:IsRelateToEffect(e) or not tc2:IsRelateToEffect(e) then return end
+	local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
+	if tc1:IsControler(tp) then ft=ft+1 end
+	if tc2:IsControler(tp) then ft=ft+1 end
+	if ft<=0 then return end
 	local sg=Duel.GetMatchingGroup(c11109820.spfilter,tp,LOCATION_EXTRA,0,nil,e,tp,tc1:GetRank()+tc2:GetRank())
 	if sg:GetCount()==0 then return end
 	Duel.SendtoGrave(g,REASON_EFFECT)

script/c24658418.lua

@@ -24,7 +24,7 @@ function c24658418.initial_effect(c)
 end
 function c24658418.condition(e,tp,eg,ep,ev,re,r,rp)
 	local at=Duel.GetAttackTarget()
-	return at:IsControler(tp) and at:IsSetCard(0x7b)
+	return at:IsFaceup() and at:IsControler(tp) and at:IsSetCard(0x7b)
 end
 function c24658418.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
@@ -33,7 +33,7 @@ function c24658418.target(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c24658418.operation(e,tp,eg,ep,ev,re,r,rp)
 	if e:GetHandler():IsRelateToEffect(e) then
-		Duel.SpecialSummon(e:GetHandler(),1,tp,tp,false,false,POS_FACEUP)
+		Duel.SpecialSummon(e:GetHandler(),1,tp,tp,false,false,POS_FACEUP_DEFENCE)
 	end
 end
 function c24658418.spcon(e,tp,eg,ep,ev,re,r,rp)

script/c29223325.lua

@@ -21,23 +21,41 @@ function c29223325.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c29223325.filter(c)
-	return c:IsSetCard(0x97) and c:IsType(TYPE_MONSTER) and c:IsSSetable()
+	return c:IsSetCard(0x97) and c:IsType(TYPE_MONSTER) and c:IsSSetable(true)
 end
 function c29223325.desfilter(c)
 	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsDestructable()
 end
+function c29223325.desfilter2(c)
+	return c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsDestructable() and c:GetSequence()~=5
+end
 function c29223325.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	if chkc then return chkc:IsOnField() and c29223325.desfilter(chkc) end
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0
-		and Duel.IsExistingTarget(c29223325.desfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,e:GetHandler())
-		and Duel.IsExistingMatchingCard(c29223325.filter,tp,LOCATION_DECK,0,1,nil) end
+	if chk==0 then
+		if not Duel.IsExistingMatchingCard(c29223325.filter,tp,LOCATION_DECK,0,1,nil) then return false end
+		local ft=Duel.GetLocationCount(tp,LOCATION_SZONE)
+		if e:GetHandler():IsLocation(LOCATION_HAND) then ft=ft-1 end
+		if ft<0 then return false
+		elseif ft>0 then
+			return Duel.IsExistingTarget(c29223325.desfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,e:GetHandler())
+		else
+			return Duel.IsExistingTarget(c29223325.desfilter2,tp,LOCATION_SZONE,0,1,e:GetHandler())
+		end
+	end
+	local ft=Duel.GetLocationCount(tp,LOCATION_SZONE)
+	local g=nil
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DESTROY)
-	local g=Duel.SelectTarget(tp,c29223325.desfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,e:GetHandler())
+	if ft>0 then
+		g=Duel.SelectTarget(tp,c29223325.desfilter,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,1,e:GetHandler())
+	else
+		g=Duel.SelectTarget(tp,c29223325.desfilter2,tp,LOCATION_SZONE,0,1,1,e:GetHandler())
+	end
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,g,1,0,0)
 end
 function c29223325.activate(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) and Duel.Destroy(tc,REASON_EFFECT)~=0 then
+		if Duel.GetLocationCount(tp,LOCATION_SZONE)<=0 then return end
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SET)
 		local g=Duel.SelectMatchingCard(tp,c29223325.filter,tp,LOCATION_DECK,0,1,1,nil)
 		if g:GetCount()>0 then

script/c32603633.lua

@@ -25,7 +25,6 @@ function c32603633.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_GRAVE)
 end
 function c32603633.op(e,tp,eg,ep,ev,re,r,rp)
-	local count=0
 	local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
 	if ft<=0 then return end
 	local g=Duel.GetMatchingGroup(c32603633.filter,tp,LOCATION_GRAVE,0,nil,e,tp)

script/c32623004.lua

@@ -6,7 +6,7 @@ function c32623004.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_QUICK_F)
 	e1:SetCode(EVENT_CHAINING)
-	e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL+EFFECT_FLAG_CHAIN_UNIQUE)
+	e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
 	e1:SetRange(LOCATION_GRAVE)
 	e1:SetCondition(c32623004.spcon)
 	e1:SetCost(c32623004.spcost)
@@ -28,7 +28,11 @@ function c32623004.spcon(e,tp,eg,ep,ev,re,r,rp)
 	return re:GetHandler():IsSetCard(0x5a)
 end
 function c32623004.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetFlagEffect(tp,32623004)==0 end
+	if chk==0 then
+		if Duel.GetFlagEffect(tp,32623005)~=0 then return false end
+		Duel.RegisterFlagEffect(tp,32623005,RESET_CHAIN,0,1)
+		return Duel.GetFlagEffect(tp,32623004)==0
+	end
 	Duel.RegisterFlagEffect(tp,32623004,RESET_PHASE+PHASE_END,0,1)
 end
 function c32623004.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
@@ -41,6 +45,5 @@ function c32623004.spop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function c32623004.rmtg(e,c)
-	local rc=c:GetReasonCard()
-	return rc and rc:IsSetCard(0x5a) and c:IsReason(REASON_EFFECT)
+	return c:IsReason(REASON_EFFECT) and c:GetReasonEffect():GetHandler():IsSetCard(0x5a)
 end

script/c33746252.lua

@@ -13,7 +13,7 @@ function c33746252.initial_effect(c)
 	e2:SetCode(EFFECT_CANNOT_ACTIVATE)
 	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e2:SetTargetRange(1,1)
-	e2:SetTarget(c33746252.aclimit)
+	e2:SetValue(c33746252.aclimit)
 	c:RegisterEffect(e2)
 end
 function c33746252.aclimit(e,re,tp)

script/c35537251.lua

@@ -12,6 +12,25 @@ function c35537251.initial_effect(c)
 	c:RegisterEffect(e1)
 end
 function c35537251.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.GetFlagEffect(tp,35537251)==0 end
+	Duel.RegisterFlagEffect(tp,35537251,RESET_PHASE+PHASE_END,0,1)
+end
+function c35537251.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then
+		local g=Group.CreateGroup()
+		for i=0,4 do
+			local tc=Duel.GetFieldCard(tp,LOCATION_MZONE,i)
+			if tc and tc:IsFaceup() and tc:IsSetCard(0x84) and tc:IsType(TYPE_XYZ) then
+				g:Merge(tc:GetOverlayGroup())
+			end
+		end
+		if g:GetCount()==0 then return false end
+		return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
+			and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false)
+	end
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
+end
+function c35537251.spop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Group.CreateGroup()
 	for i=0,4 do
 		local tc=Duel.GetFieldCard(tp,LOCATION_MZONE,i)
@@ -19,18 +38,10 @@ function c35537251.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 			g:Merge(tc:GetOverlayGroup())
 		end
 	end
-	if chk==0 then return g:GetCount()>0 and Duel.GetFlagEffect(tp,35537251)==0 end
+	if g:GetCount()==0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_REMOVEXYZ)
 	local sg=g:Select(tp,1,1,nil)
-	Duel.SendtoGrave(sg,REASON_COST)
-	Duel.RegisterFlagEffect(tp,35537251,RESET_PHASE+PHASE_END,0,1)
-end
-function c35537251.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>0
-		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false) end
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,e:GetHandler(),1,0,0)
-end
-function c35537251.spop(e,tp,eg,ep,ev,re,r,rp)
+	Duel.SendtoGrave(sg,REASON_EFFECT)
 	if e:GetHandler():IsRelateToEffect(e) then
 		Duel.SpecialSummon(e:GetHandler(),0,tp,tp,false,false,POS_FACEUP)
 	end

script/c45286019.lua

@@ -6,6 +6,7 @@ function c45286019.initial_effect(c)
 	e1:SetCategory(CATEGORY_SPECIAL_SUMMON)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
+	e1:SetProperty(EFFECT_FLAG_CHAIN_UNIQUE)
 	e1:SetCondition(c45286019.spcon)
 	e1:SetCost(c45286019.spcost)
 	e1:SetTarget(c45286019.sptg)

script/c46871387.lua

@@ -25,7 +25,8 @@ function c46871387.initial_effect(c)
 end
 c46871387.xyz_number=55
 function c46871387.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetFlagEffect(tp,46871387)==0 end
+	if chk==0 then return Duel.GetFlagEffect(tp,46871387)==0 and e:GetHandler():CheckRemoveOverlayCard(tp,1,REASON_COST) end
+	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
 	Duel.RegisterFlagEffect(tp,46871387,RESET_PHASE+PHASE_END,0,1)
 end
 function c46871387.filter(c)

script/c46925518.lua

@@ -64,7 +64,7 @@ function c46925518.operation(e,tp,eg,ep,ev,re,r,rp)
 	if sg:GetCount()>0 and Duel.SelectYesNo(tp,aux.Stringid(46925518,1)) then
 		Duel.BreakEffect()
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-		local tg=g:Select(tp,1,1,nil)
+		local tg=sg:Select(tp,1,1,nil)
 		if Duel.SpecialSummon(tg,0,tp,tp,false,false,POS_FACEDOWN_DEFENCE)~=0 then
 			Duel.ConfirmCards(1-tp,tg)
 		end

script/c48716527.lua

@@ -33,7 +33,7 @@ function c48716527.actcon(e,tp,eg,ep,ev,re,r,rp)
 		and Duel.IsExistingMatchingCard(c48716527.cfilter,tp,LOCATION_MZONE,0,1,nil)
 end
 function c48716527.distg(e,c)
-	return bit.band(c:GetSummonType(),SUMMON_TYPE_ADVANCE)==0
+	return bit.band(c:GetSummonType(),SUMMON_TYPE_ADVANCE)~=SUMMON_TYPE_ADVANCE
 end
 function c48716527.tgcon(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.GetTurnPlayer()==tp

script/c49838105.lua

@@ -20,8 +20,7 @@ function c49838105.initial_effect(c)
 	e3:SetDescription(aux.Stringid(49838105,1))
 	e3:SetCategory(CATEGORY_TOHAND)
 	e3:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
-	e3:SetCode(EVENT_PHASE+PHASE_DRAW)
-	e3:SetCountLimit(1)
+	e3:SetCode(EVENT_PREDRAW)
 	e3:SetRange(LOCATION_SZONE)
 	e3:SetCondition(c49838105.cfcon)
 	e3:SetTarget(c49838105.cftg)
@@ -75,11 +74,12 @@ function c49838105.cfop(e,tp,eg,ep,ev,re,r,rp)
 		Duel.ConfirmDecktop(tp,1)
 		local g=Duel.GetDecktopGroup(tp,1)
 		local tc=g:GetFirst()
+		Duel.DisableShuffleCheck()
 		if tc:IsRace(RACE_PLANT) then
-			Duel.DisableShuffleCheck()
 			Duel.SendtoGrave(tc,REASON_EFFECT+REASON_REVEAL)
 		else
 			Duel.SendtoHand(tc,nil,REASON_EFFECT)
+			Duel.ShuffleHand(tp)
 		end
 	end
 end

script/c56051086.lua

@@ -69,12 +69,11 @@ function c56051086.eqop(e,tp,eg,ep,ev,re,r,rp)
 		e1:SetCode(EFFECT_EQUIP_LIMIT)
 		e1:SetReset(RESET_EVENT+0x1fe0000)
 		e1:SetValue(c56051086.eqlimit)
-		e1:SetLabelObject(tc)
 		tc:RegisterEffect(e1)
 	end
 end
 function c56051086.eqlimit(e,c)
-	return c==e:GetLabelObject()
+	return c==e:GetOwner()
 end
 function c56051086.indcon(e)
 	return e:GetHandler():GetEquipGroup():IsExists(Card.IsSetCard,1,nil,0x48)

script/c57734012.lua

@@ -3,7 +3,7 @@ function c57734012.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
-	e1:SetCode(EVENT_DRAW)
+	e1:SetCode(EVENT_TO_HAND)
 	e1:SetCondition(c57734012.regcon)
 	e1:SetOperation(c57734012.regop)
 	c:RegisterEffect(e1)
@@ -17,8 +17,9 @@ function c57734012.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c57734012.regcon(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
 	return Duel.GetFlagEffect(tp,57734012)==0 and Duel.GetCurrentPhase()==PHASE_DRAW
-		and e:GetHandler():IsReason(REASON_RULE) and not e:GetHandler():IsPublic()
+		and c:IsReason(REASON_DRAW) and c:IsReason(REASON_RULE) and not c:IsPublic()
 end
 function c57734012.regop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -26,7 +27,7 @@ function c57734012.regop(e,tp,eg,ep,ev,re,r,rp)
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetCode(EFFECT_PUBLIC)
-		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END)
+		e1:SetReset(RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_MAIN1)
 		c:RegisterEffect(e1)
 		c:RegisterFlagEffect(57734012,RESET_PHASE+PHASE_MAIN1,0,1)
 	end

script/c59708927.lua

@@ -31,14 +31,14 @@ end
 function c59708927.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>1
 		and e:GetHandler():IsCanBeSpecialSummoned(e,0,tp,false,false)
-		and Duel.IsExistingMatchingCard(c59708927.filter,tp,LOCATION_HAND,0,1,nil,e,tp) end
+		and Duel.IsExistingMatchingCard(c59708927.filter,tp,LOCATION_HAND,0,1,e:GetHandler(),e,tp) end
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,2,tp,LOCATION_HAND)
 end
 function c59708927.spop(e,tp,eg,ep,ev,re,r,rp)
 	if not e:GetHandler():IsRelateToEffect(e) then return end
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<2 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectMatchingCard(tp,c59708927.filter,tp,LOCATION_HAND,0,1,1,nil,e,tp)
+	local g=Duel.SelectMatchingCard(tp,c59708927.filter,tp,LOCATION_HAND,0,1,1,e:GetHandler(),e,tp)
 	if g:GetCount()>0 then
 		g:AddCard(e:GetHandler())
 		Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)

script/c6351548.lua

@@ -6,7 +6,7 @@ function c6351548.initial_effect(c)
 	e1:SetCategory(CATEGORY_TOGRAVE)
 	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e1:SetCode(EVENT_TO_GRAVE)
-	e1:SetProperty(EFFECT_FLAG_DELAY+EFFECT_FLAG_CHAIN_UNIQUE)
+	e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DELAY+EFFECT_FLAG_CHAIN_UNIQUE)
 	e1:SetCondition(c6351548.condition)
 	e1:SetCost(c6351548.cost)
 	e1:SetTarget(c6351548.target)

script/c68191243.lua

@@ -26,7 +26,6 @@ function c68191243.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
 end
 function c68191243.op(e,tp,eg,ep,ev,re,r,rp)
-	local count=0
 	local ft=Duel.GetLocationCount(tp,LOCATION_MZONE)
 	if ft<=0 then return end
 	local g=Duel.GetMatchingGroup(c68191243.filter,tp,LOCATION_HAND,0,nil,e,tp)

script/c69840739.lua

@@ -11,6 +11,7 @@ function c69840739.initial_effect(c)
 	e1:SetRange(LOCATION_MZONE)
 	e1:SetCondition(c69840739.chcon)
 	e1:SetCost(c69840739.cost)
+	e1:SetTarget(c69840739.chtg)
 	e1:SetOperation(c69840739.chop)
 	c:RegisterEffect(e1)
 	--reload
@@ -36,6 +37,9 @@ function c69840739.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
 	e:GetHandler():RegisterFlagEffect(69840739,RESET_EVENT+0x1fe0000+RESET_PHASE+PHASE_END,0,1)
 end
+function c69840739.chtg(e,tp,eg,ep,ev,re,r,rp,chk)
+	if chk==0 then return Duel.IsExistingMatchingCard(c69840739.filter,rp,0,LOCATION_ONFIELD,1,nil) end
+end
 function c69840739.chop(e,tp,eg,ep,ev,re,r,rp)
 	local g=Group.CreateGroup()
 	Duel.ChangeTargetCard(ev,g)

script/c71921856.lua

@@ -33,7 +33,7 @@ function c71921856.initial_effect(c)
 end
 c71921856.xyz_number=79
 function c71921856.filter(c)
-	return c:IsSetCard(0x85)
+	return c:IsSetCard(0x84)
 end
 function c71921856.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsExistingMatchingCard(c71921856.filter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,nil) end

script/c73136204.lua

@@ -4,9 +4,9 @@ function c73136204.initial_effect(c)
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(73136204,0))
 	e1:SetCategory(CATEGORY_TOGRAVE)
-	e1:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
-	e1:SetProperty(EFFECT_FLAG_DAMAGE_STEP)
-	e1:SetCode(EVENT_SUMMON_SUCCESS)
+	e1:SetType(EFFECT_TYPE_IGNITION)
+	e1:SetRange(LOCATION_MZONE)
+	e1:SetCountLimit(1)
 	e1:SetTarget(c73136204.target)
 	e1:SetOperation(c73136204.operation)
 	c:RegisterEffect(e1)

script/c74100225.lua

@@ -22,9 +22,9 @@ function c74100225.target(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 		and Duel.IsExistingTarget(c74100225.filter,tp,LOCATION_GRAVE,0,1,nil,0x604e)
 		and Duel.IsExistingMatchingCard(c74100225.spfilter,tp,LOCATION_EXTRA,0,1,nil,e,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
-	local g1=Duel.SelectTarget(tp,c74100225.filter,tp,0,LOCATION_MZONE,1,1,nil,0x304e)
+	local g1=Duel.SelectTarget(tp,c74100225.filter,tp,LOCATION_GRAVE,0,1,1,nil,0x304e)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_XMATERIAL)
-	local g2=Duel.SelectTarget(tp,c74100225.filter,tp,0,LOCATION_MZONE,1,1,nil,0x604e)
+	local g2=Duel.SelectTarget(tp,c74100225.filter,tp,LOCATION_GRAVE,0,1,1,nil,0x604e)
 	g1:Merge(g2)
 	Duel.SetOperationInfo(0,CATEGORY_LEAVE_GRAVE,g1,2,0,0)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)

script/c8038143.lua

@@ -21,6 +21,7 @@ function c8038143.cfilter(c)
 end
 function c8038143.condition(e,tp,eg,ep,ev,re,r,rp)
 	return Duel.IsExistingMatchingCard(c8038143.cfilter,tp,LOCATION_MZONE,0,1,nil)
+		and rp~=tp and (re:IsActiveType(TYPE_MONSTER) or re:IsHasType(EFFECT_TYPE_ACTIVATE)) and Duel.IsChainNegatable(ev)
 end
 function c8038143.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
@@ -28,10 +29,10 @@ function c8038143.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	local dg=Group.CreateGroup()
 	for i=1,ev do
 		local te,tgp=Duel.GetChainInfo(i,CHAININFO_TRIGGERING_EFFECT,CHAININFO_TRIGGERING_PLAYER)
-		if tgp~=tp and (te:IsActiveType(TYPE_MONSTER) or te:IsHasType(EFFECT_TYPE_ACTIVATE)) then
+		if tgp~=tp then
 			local tc=te:GetHandler()
 			ng:AddCard(tc)
-			if tc:IsOnField() and tc:IsRelateToEffect(te) and tc:IsAbleToDeck() then
+			if tc:IsOnField() and tc:IsRelateToEffect(te) then
 				dg:AddCard(tc)
 			end
 		end
@@ -44,10 +45,10 @@ function c8038143.activate(e,tp,eg,ep,ev,re,r,rp)
 	local dg=Group.CreateGroup()
 	for i=1,ev do
 		local te,tgp=Duel.GetChainInfo(i,CHAININFO_TRIGGERING_EFFECT,CHAININFO_TRIGGERING_PLAYER)
-		if tgp~=tp and (te:IsActiveType(TYPE_MONSTER) or te:IsHasType(EFFECT_TYPE_ACTIVATE)) then
+		if tgp~=tp then
 			Duel.NegateActivation(i)
 			local tc=te:GetHandler()
-			if tc:IsRelateToEffect(e) and tc:IsRelateToEffect(te) and tc:IsAbleToDeck() then
+			if tc:IsRelateToEffect(e) and tc:IsRelateToEffect(te) then
 				tc:CancelToGrave()
 				dg:AddCard(tc)
 			end

script/c81994591.lua

@@ -46,7 +46,7 @@ end
 function c81994591.indop(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())
 	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetCode(EFFECT_INDESTRUCTABLE)
+	e1:SetCode(EFFECT_DESTROY_SUBSTITUTE)
 	e1:SetTargetRange(LOCATION_MZONE,0)
 	e1:SetTarget(aux.TargetBoolFunction(Card.IsSetCard,0x1d))
 	e1:SetReset(RESET_PHASE+PHASE_END)

script/c8316565.lua

@@ -16,7 +16,8 @@ end
 function c8316565.condition(e,tp,eg,ep,ev,re,r,rp)
 	local ph=Duel.GetCurrentPhase()
 	return Duel.IsExistingMatchingCard(c8316565.cfilter,tp,LOCATION_MZONE,0,1,nil)
-		and ph>PHASE_MAIN1 and ph<PHASE_MAIN2 and re:IsHasType(EFFECT_TYPE_ACTIVATE) and Duel.IsChainNegatable(ev)
+		and ph>PHASE_MAIN1 and ph<PHASE_MAIN2
+		and (re:IsActiveType(TYPE_MONSTER) or re:IsHasType(EFFECT_TYPE_ACTIVATE)) and Duel.IsChainNegatable(ev)
 end
 function c8316565.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end

script/c85827713.lua

@@ -31,8 +31,7 @@ function c85827713.sumcon(e)
 end
 function c85827713.limcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	return rp~=tp and c:IsReason(REASON_DESTROY)
-		and c:IsPreviousLocation(LOCATION_ONFIELD) and c:GetPreviousControler()==tp
+	return rp~=tp and c:IsReason(REASON_DESTROY) and c:GetPreviousControler()==tp
 end
 function c85827713.limop(e,tp,eg,ep,ev,re,r,rp)
 	local e1=Effect.CreateEffect(e:GetHandler())

script/c9260791.lua

@@ -28,16 +28,17 @@ function c9260791.spcost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 function c9260791.spfilter(c,e,tp)
 	return c:IsSetCard(0x107b) and not c:IsCode(9260791) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+		and not c:IsHasEffect(EFFECT_NECRO_VALLEY)
 end
 function c9260791.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_MZONE)>-1
-		and Duel.IsExistingMatchingCard(c9260791.spfilter,tp,LOCATION_HAND,0,1,nil,e,tp) end
-	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND)
+		and Duel.IsExistingMatchingCard(c9260791.spfilter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,nil,e,tp) end
+	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_HAND+LOCATION_GRAVE)
 end
 function c9260791.spop(e,tp,eg,ep,ev,re,r,rp)
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<=0 then return end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
-	local g=Duel.SelectMatchingCard(tp,c9260791.spfilter,tp,LOCATION_HAND,0,1,1,nil,e,tp)
+	local g=Duel.SelectMatchingCard(tp,c9260791.spfilter,tp,LOCATION_HAND+LOCATION_GRAVE,0,1,1,nil,e,tp)
 	if g:GetCount()>0 then
 		Duel.SpecialSummon(g,0,tp,tp,false,false,POS_FACEUP)
 	end

script/c93238626.lua

@@ -14,6 +14,7 @@ function c93238626.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_F)
 	e2:SetCode(EVENT_PHASE+PHASE_END)
 	e2:SetRange(LOCATION_SZONE)
+	e2:SetCountLimit(1)
 	e2:SetCondition(c93238626.reccon)
 	e2:SetTarget(c93238626.rectg)
 	e2:SetOperation(c93238626.recop)

script/c95239444.lua

@@ -47,7 +47,8 @@ function c95239444.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e:GetHandler():RemoveOverlayCard(tp,1,1,REASON_COST)
 end
 function c95239444.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>0 end
+	if chk==0 then return Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>0
+		and Duel.IsExistingMatchingCard(Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,e:GetHandler()) end
 end
 function c95239444.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
@@ -65,6 +66,7 @@ function c95239444.operation(e,tp,eg,ep,ev,re,r,rp)
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_RTOHAND)
 		local tg=Duel.SelectMatchingCard(tp,Card.IsAbleToHand,tp,LOCATION_ONFIELD,LOCATION_ONFIELD,1,sg:GetCount(),c)
 		if tg:GetCount()>0 then
+			Duel.BreakEffect()
 			Duel.DisableShuffleCheck(false)
 			Duel.SendtoHand(tg,nil,REASON_EFFECT)
 		end