fix

expansions/script/c12866765.lua

@@ -56,11 +56,11 @@ function s.splimit(e,se,sp,st)
 	return not e:GetHandler():IsLocation(LOCATION_EXTRA) or aux.fuslimit(e,se,sp,st)
 end
 function s.eqfilter(c,tp)
-	return c:IsType(TYPE_MONSTER) and c:CheckUniqueOnField(tp) and c:GetBaseAttack()<=1500
+	return c:IsType(TYPE_MONSTER) and c:CheckUniqueOnField(tp) and c:GetBaseAttack()<=1500 and c:IsFaceup()
 end
 function s.eqtg(e,tp,eg,ep,ev,re,r,rp,chk,chkc)
 	local c=e:GetHandler()
-	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc~=c end
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc~=c and s.eqfilter(chkc,tp) end
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0
 		and Duel.IsExistingTarget(s.eqfilter,tp,LOCATION_MZONE,LOCATION_MZONE,1,c,tp) end
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_EQUIP)

expansions/script/c65899940.lua

 --空间乱流
-function c65840000.initial_effect(c)
-	aux.AddCodeList(c,65840000)
+function c65899940.initial_effect(c)
+	aux.AddCodeList(c,65899940)
 	--Activate
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_DRAW)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e1:SetCode(EVENT_FREE_CHAIN)
-	e1:SetTarget(c65840000.target)
-	e1:SetOperation(c65840000.activate)
+	e1:SetTarget(c65899940.target)
+	e1:SetOperation(c65899940.activate)
 	c:RegisterEffect(e1)
 	--
 	local e2=Effect.CreateEffect(c)
@@ -16,47 +16,47 @@ function c65840000.initial_effect(c)
 	e2:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e2:SetCode(EVENT_TO_GRAVE)
 	e2:SetProperty(EFFECT_FLAG_DELAY)
-	e2:SetTarget(c65840000.target2)
-	e2:SetOperation(c65840000.activate2)
+	e2:SetTarget(c65899940.target2)
+	e2:SetOperation(c65899940.activate2)
 	c:RegisterEffect(e2)
 	--remove
 	local e3=Effect.CreateEffect(c)
 	e3:SetCategory(CATEGORY_REMOVE)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
 	e3:SetCode(EVENT_REMOVE)
-	e3:SetTarget(c65840000.rmtg)
-	e3:SetOperation(c65840000.rmop)
+	e3:SetTarget(c65899940.rmtg)
+	e3:SetOperation(c65899940.rmop)
 	c:RegisterEffect(e3)
 end
 
 
 
-function c65840000.target(e,tp,eg,ep,ev,re,r,rp,chk)
+function c65899940.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.IsPlayerCanDraw(tp,1) end
 	Duel.SetTargetPlayer(tp)
 	Duel.SetTargetParam(1)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
 end
-function c65840000.activate(e,tp,eg,ep,ev,re,r,rp)
+function c65899940.activate(e,tp,eg,ep,ev,re,r,rp)
 	local p,d=Duel.GetChainInfo(0,CHAININFO_TARGET_PLAYER,CHAININFO_TARGET_PARAM)
 	Duel.Draw(p,d,REASON_EFFECT)
 end
 
-function c65840000.target2(e,tp,eg,ep,ev,re,r,rp,chk)
+function c65899940.target2(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if chk==0 then return true end
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,1,tp,LOCATION_GRAVE)
 end
-function c65840000.activate2(e,tp,eg,ep,ev,re,r,rp)
+function c65899940.activate2(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	Duel.Remove(c,POS_FACEUP,REASON_EFFECT)
 end
 
-function c65840000.rmtg(e,tp,eg,ep,ev,re,r,rp,chk)
+function c65899940.rmtg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.SetOperationInfo(0,CATEGORY_REMOVE,nil,5,tp,LOCATION_DECK)
 end
-function c65840000.rmop(e,tp,eg,ep,ev,re,r,rp)
+function c65899940.rmop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local g1=Duel.GetDecktopGroup(tp,5)
 	Duel.DisableShuffleCheck()
@@ -66,9 +66,9 @@ function c65840000.rmop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e1:SetCode(EFFECT_CANNOT_ACTIVATE)
 	e1:SetTargetRange(1,0)
-	e1:SetValue(c65840000.aclimit)
+	e1:SetValue(c65899940.aclimit)
 	Duel.RegisterEffect(e1,tp)
 end
-function c65840000.aclimit(e,re,tp)
-	return re:GetActivateLocation()==LOCATION_REMOVED and not re:GetHandler():IsCode(65840000) and (re:IsActiveType(TYPE_MONSTER) or re:IsActiveType(TYPE_SPELL) or re:IsActiveType(TYPE_TRAP))
+function c65899940.aclimit(e,re,tp)
+	return re:GetActivateLocation()==LOCATION_REMOVED and not re:GetHandler():IsCode(65899940) and (re:IsActiveType(TYPE_MONSTER) or re:IsActiveType(TYPE_SPELL) or re:IsActiveType(TYPE_TRAP))
 end
\ No newline at end of file