fix

expansions/script/c12835107.lua

@@ -170,9 +170,9 @@ function s.moveop(e,tp,eg,ep,ev,re,r,rp)
 		e2:SetReset(RESET_EVENT+RESETS_STANDARD)
 		e2:SetValue(-500)
 		if s.roll(1,2)==1 then
-			if c:IsAttackBelow(499) then return end
+			if tc:IsAttackBelow(499) then return end
 		else
-			if c:IsDefenseBelow(499) then return end
+			if tc:IsDefenseBelow(499) then return end
 			e2:SetCode(EFFECT_UPDATE_DEFENSE)
 		end
 		tc:RegisterEffect(e2)

expansions/script/c18700897.lua

@@ -24,6 +24,7 @@ function cm.initial_effect(c)
 	e3:SetCategory(CATEGORY_SEARCH+CATEGORY_TOHAND)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e3:SetCode(EVENT_DESTROYED)
+	e3:SetProperty(EFFECT_FLAG_DELAY)
 	e3:SetCountLimit(1,m+1)
 	e3:SetCondition(cm.thcon)
 	e3:SetTarget(cm.thtg)

expansions/script/c60000186.lua

@@ -92,8 +92,7 @@ function cm.bkop(e,tp,eg,ep,ev,re,r,rp,c)
 		if op==0 then
 			Duel.SendtoDeck(c,nil,0,REASON_EFFECT)
 			Duel.BreakEffect()
-			local num=Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)
-			local ug=Duel.GetFieldGroup(tp,LOCATION_DECK,0):Sub(Duel.GetDecktopGroup(tp,num-1))
+			local ug=Duel.GetFieldGroup(tp,LOCATION_DECK,0):Filter(cm.location,nil)
 			Duel.SendtoHand(ug,nil,REASON_EFFECT)
 		elseif op==1 then
 			Duel.SendtoDeck(c,nil,1,REASON_EFFECT)
@@ -103,6 +102,9 @@ function cm.bkop(e,tp,eg,ep,ev,re,r,rp,c)
 		end
 	end
 end
+function cm.location(c)
+	return c:GetSequence()==0
+end
 --random
 function getrand()
 	local result=0

expansions/script/c60000189.lua

@@ -42,6 +42,7 @@ function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_TOGRAVE,nil,1,tp,LOCATION_DECK)
 end
 function cm.activate(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
 	local g=Duel.SelectMatchingCard(tp,cm.filter,tp,LOCATION_DECK,0,1,1,nil)
 	Duel.RegisterFlagEffect(tp,m,RESET_PHASE+PHASE_END,0,1)

expansions/script/c60000224.lua

@@ -34,7 +34,7 @@ function s.thfilter(c)
 	return c:IsCode(60000211) and c:IsAbleToHand()
 end
 function s.spfilter(c,e,tp)
-	return c:IsCode(60000211) and c:IsCanBeSpecialSummoned(e,0,tp,true,false) and (c:IsLocation(LOCATION_GRAVE) or (c:IsLocation(LOCATION_REMOVED) and c:IsFaceup()))
+	return c:IsCode(60000211) and c:IsCanBeSpecialSummoned(e,0,tp,true,false) and (c:IsLocation(LOCATION_HAND) or (c:IsLocation(LOCATION_REMOVED) and c:IsFaceup()))
 end
 function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then
@@ -54,7 +54,7 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 		local b2=Duel.IsExistingMatchingCard(s.spfilter,tp,LOCATION_HAND+LOCATION_REMOVED,0,1,nil,e,tp) and Duel.GetFlagEffect(tp,id+20000000)==0
 			and Duel.GetLocationCount(tp,LOCATION_MZONE)>0
 	if not b1 and not b2 then return end
-	local op=aux.SelectFromOptions(tp,{b1,aux.Stringid(id,2)},{b2,aux.Stringid(id,3)})
+	local op=aux.SelectFromOptions(tp,{b1,aux.Stringid(id,1)},{b2,aux.Stringid(id,2)})
 	if op==1 then
 		Duel.RegisterFlagEffect(tp,id+10000000,RESET_PHASE+PHASE_END,0,1)
 		-- 检索效果

expansions/script/c60000225.lua

@@ -53,7 +53,7 @@ function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function cm.thop(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.SelectYesNo(tp,aux.Stringid(id,4)) then
+	if Duel.SelectYesNo(tp,aux.Stringid(m,4)) then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 		local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(cm.thfilter),tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
 		if #g>0 then

expansions/script/c60000226.lua

@@ -55,7 +55,7 @@ function cm.thcon(e,tp,eg,ep,ev,re,r,rp)
 end
 
 function cm.thop(e,tp,eg,ep,ev,re,r,rp)
-	if Duel.SelectYesNo(tp,aux.Stringid(id,4)) then
+	if Duel.SelectYesNo(tp,aux.Stringid(m,4)) then
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 		local g=Duel.SelectMatchingCard(tp,aux.NecroValleyFilter(cm.thfilter),tp,LOCATION_DECK+LOCATION_GRAVE,0,1,1,nil)
 		if #g>0 then

expansions/script/c60010029.lua

@@ -112,7 +112,7 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 		g:AddCard(ac)
 		if g:GetClassCount(Card.GetRace)==g:GetCount() and g:GetClassCount(Card.GetAttribute)==g:GetCount() then
 			cg:AddCard(ac)
-			Debug.Message("1")
+			--Debug.Message("1")
 		end
 		g:RemoveCard(ac)
 		ac=dg:GetNext()

expansions/script/c60010047.lua

@@ -38,7 +38,7 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp)
 		end 
 		te:UseCountLimit(tp,1,true)
 		cm.ActivateCard(ec,tp,e)
-		if (not (ec:IsType(TYPE_CONTINUOUS) or ec:IsType(TYPE_FIELD) or ec:IsType(TYPE_EQUIP))) and ec:IsRelateToEffect(e) then
+		if not (ec:IsType(TYPE_CONTINUOUS) or ec:IsType(TYPE_FIELD) or ec:IsType(TYPE_EQUIP)) then
 			 Duel.SendtoGrave(ec,REASON_RULE)
 		end
 	end

expansions/script/c60010076.lua

@@ -9,12 +9,15 @@ function cm.initial_effect(c)
 	e11:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e11:SetCode(EVENT_SPSUMMON_SUCCESS)
 	e11:SetProperty(EFFECT_FLAG_DELAY)
-	e11:SetRange(LOCATION_HAND+LOCATION_GRAVE)
+	e11:SetRange(LOCATION_HAND)
 	e11:SetCountLimit(1,m+10000000)
 	e11:SetCondition(cm.spcon)
 	e11:SetTarget(cm.sptg)
 	e11:SetOperation(cm.spop)
 	c:RegisterEffect(e11)
+	local e22=e11:Clone()
+	e22:SetCondition(cm.spcon2)
+	c:RegisterEffect(e22)
 	--search
 	local e3=Effect.CreateEffect(c)
 	--e3:SetDescription(aux.Stringid(m,4))
@@ -27,12 +30,18 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function cm.cfilter(c,tp)
-	return c:IsSummonPlayer(1-tp) and (c:IsSummonLocation(LOCATION_EXTRA) or Duel.IsPlayerAffectedByEffect(tp,60010135))
+	return c:IsSummonPlayer(1-tp) --and (c:IsSummonLocation(LOCATION_EXTRA) or Duel.IsPlayerAffectedByEffect(tp,60010135))
 end
 function cm.spcon(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
+	local tp=e:GetHandlerPlayer()
 	return eg:IsExists(cm.cfilter,1,nil,tp)
 end
+function cm.spcon2(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	local tp=e:GetHandlerPlayer()
+	return eg:IsExists(cm.cfilter,1,nil,tp) and Duel.IsPlayerAffectedByEffect(tp,60010135)
+end
 function cm.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

expansions/script/c60010077.lua

@@ -37,7 +37,7 @@ function c60010077.initial_effect(c)
 	c:RegisterEffect(e3)
 end
 function c60010077.spcon(e,tp,eg,ep,ev,re,r,rp)
-	return not Duel.IsExistingMatchingCard(aux.TRUE,tp,LOCATION_FZONE,0,1,nil)
+	return not Duel.IsExistingMatchingCard(aux.TRUE,e:GetHandlerPlayer(),LOCATION_FZONE,0,1,nil)
 end
 function c60010077.filter(c,tp)
 	return c:IsCode(60010029) and c:IsType(TYPE_FIELD) and c:GetActivateEffect():IsActivatable(tp,true,true)

expansions/script/c60010137.lua

@@ -85,7 +85,6 @@ function c60010137.drop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e1:SetCode(EVENT_PHASE+PHASE_END)
 	e1:SetCountLimit(1)
-	e1:SetReset(RESET_PHASE+PHASE_END)
 	e1:SetOperation(c60010137.draw)
 	Duel.RegisterEffect(e1,tp)
 end
@@ -99,6 +98,7 @@ function c60010137.draw(e,tp,eg,ep,ev,re,r,rp)
 			Duel.SSet(tp,sg)
 		end
 	end
+	e:Reset()
 end
 function c60010137.ownerfilter(c,tp)
 	return c:IsCode(60010031) and c:IsFaceup() and c:IsSummonPlayer(tp)