eme

expansions/script/c1156003.lua

@@ -47,6 +47,7 @@ function c1156003.tg1(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_SPECIAL_SUMMON,nil,1,tp,LOCATION_EXTRA)
 end
 function c1156003.op1(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)
 	local sg=Duel.SelectMatchingCard(tp,c1156003.tfilter1,tp,LOCATION_EXTRA,0,1,1,nil,e,tp)
 	local tc=sg:GetFirst()

expansions/script/c16114288.lua

@@ -22,7 +22,7 @@ function cm.initial_effect(c)
 end
 --e1
 function cm.targetget(c)
-	return c:GetOriginalCode()==m-1 and c:IsFaceup()
+	return c:GetOriginalCode()==16114247 and c:IsFaceup()
 end
 function cm.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return c16114247[tp]>0 and Duel.IsExistingTarget(cm.targetget,tp,LOCATION_MZONE,0,1,nil) end

expansions/script/c60002018.lua

@@ -40,7 +40,7 @@ function c60002018.initial_effect(c)
 end
 function c60002018.checkcon(e,tp,eg,ep,ev,re,r,rp)
 	local rc=re:GetHandler() 
-	return rc:IsType(TYPE_TRAP) and rc:IsType(TYPE_COUNTER) and re:IsHasType(EFFECT_TYPE_ACTIVATE)
+	return rc:IsType(TYPE_TRAP) and rc:IsType(TYPE_COUNTER) 
 end
 function c60002018.checkop(e,tp,eg,ep,ev,re,r,rp)
 	local p=re:GetHandlerPlayer()
@@ -58,9 +58,6 @@ end
 function c60002018.sttg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetLocationCount(tp,LOCATION_SZONE)>0 end
 end
-function c60002018.thfil(c) 
-	return c:IsType(TYPE_SPELL) and c:IsSetCard(0x629) 
-end
 function c60002018.stop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	if c:IsRelateToEffect(e) and Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEDOWN,true) then 
@@ -89,11 +86,21 @@ function c60002018.stop(e,tp,eg,ep,ev,re,r,rp)
 	e1:SetCode(EFFECT_CANNOT_TRIGGER)
 	e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 	c:RegisterEffect(e1)
-	if Duel.IsExistingMatchingCard(c60002018.thfil,tp,LOCATION_DECK,0,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(60002018,0)) then 
+	if Duel.IsExistingMatchingCard(Card.IsFaceup,tp,0,LOCATION_ONFIELD,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(60002018,0)) then 
 	Duel.BreakEffect()
-	local tc=Duel.SelectMatchingCard(tp,c60002018.thfil,tp,LOCATION_DECK,0,1,1,nil):GetFirst() 
-	Duel.SendtoHand(tc,tp,REASON_EFFECT) 
-	Duel.ConfirmCards(1-tp,tc)
+	local tc=Duel.SelectMatchingCard(tp,Card.IsFaceup,tp,0,LOCATION_ONFIELD,1,1,nil):GetFirst() 
+	   Duel.NegateRelatedChain(tc,RESET_TURN_SET)
+		local e1=Effect.CreateEffect(c)
+		e1:SetType(EFFECT_TYPE_SINGLE)
+		e1:SetCode(EFFECT_DISABLE)
+		e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
+		tc:RegisterEffect(e1)
+		local e2=Effect.CreateEffect(c)
+		e2:SetType(EFFECT_TYPE_SINGLE)
+		e2:SetCode(EFFECT_DISABLE_EFFECT)
+		e2:SetValue(RESET_TURN_SET)
+		e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
+		tc:RegisterEffect(e2)
 	end
 	Duel.RaiseEvent(c,EVENT_SSET,e,REASON_EFFECT,tp,tp,0) 
 	end

expansions/script/c60002022.lua

@@ -2,7 +2,6 @@
 function c60002022.initial_effect(c)
 	--Activate
 	local e1=Effect.CreateEffect(c)
-	e1:SetDescription(aux.Stringid(60002022,1))
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetCountLimit(1,60002022+EFFECT_COUNT_CODE_OATH)
@@ -12,7 +11,7 @@ function c60002022.initial_effect(c)
 	c:RegisterEffect(e1)
 	--xx
 	local e2=Effect.CreateEffect(c)
-	e2:SetDescription(aux.Stringid(60002022,2))
+	e2:SetDescription(aux.Stringid(60002022,1))
 	e2:SetType(EFFECT_TYPE_QUICK_O) 
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetRange(LOCATION_HAND)
@@ -33,7 +32,7 @@ function c60002022.initial_effect(c)
 end
 function c60002022.checkcon(e,tp,eg,ep,ev,re,r,rp)
 	local rc=re:GetHandler() 
-	return rc:IsType(TYPE_TRAP) and rc:IsType(TYPE_COUNTER) and re:IsHasType(EFFECT_TYPE_ACTIVATE)
+	return rc:IsType(TYPE_TRAP) and rc:IsType(TYPE_COUNTER) 
 end
 function c60002022.checkop(e,tp,eg,ep,ev,re,r,rp)
 	local p=re:GetHandlerPlayer()
@@ -57,17 +56,17 @@ end
 function c60002022.ckfil(c)
 	return c:IsSetCard(0x629) or (c:IsType(TYPE_TRAP) and c:IsType(TYPE_COUNTER))
 end
-function c60002022.thfil1(c)
+function c60002022.ckfil(c)
 	return c:IsAbleToHand() and (c:IsType(TYPE_TRAP) and c:IsType(TYPE_COUNTER))
 end
 function c60002022.acop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>=10 then 
+	if Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)<10 then return end
 	Duel.ConfirmDecktop(tp,10)
 	local g=Duel.GetDecktopGroup(tp,10)
 	local x=g:FilterCount(c60002022.ckfil,nil) 
-	local g1=g:Filter(c60002022.thfil1,nil)
-	local g2=g1:Select(tp,1,1,nil)
+	g1=g:Filter(c60002022.thfil1,nil)
+	g2=g1:Select(tp,1,1,nil)
 	Duel.SendtoHand(g2,tp,REASON_EFFECT)
 	Duel.ConfirmCards(1-tp,g2)
 		--
@@ -91,7 +90,6 @@ function c60002022.acop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.SendtoHand(g3,tp,REASON_EFFECT)
 	Duel.ConfirmCards(1-tp,g3)
 	end
-	end
 end
 function c60002022.aclimit(e,re,tp)
 	return re:GetHandler():IsCode(e:GetLabel())

expansions/script/c81015073.lua

@@ -57,13 +57,13 @@ function cm.ffilter(c)
 	return c:IsFusionSetCard(0x81a) and c:IsFusionType(TYPE_FUSION+TYPE_SYNCHRO+TYPE_XYZ+TYPE_LINK)
 end
 function cm.atkfilter(c)
-	return c:IsType(TYPE_SPELL+TYPE_TRAP) and (c:IsLocation(LOCATION_GRAVE) or c:IsFaceup())
+	return c:IsType(TYPE_SPELL+TYPE_TRAP) and (c:IsFaceup() or not c:IsLocation(LOCATION_REMOVED))
 end
 function cm.value(e,c)
-	return Duel.GetMatchingGroupCount(cm.atkfilter,c:GetControler(),0,LOCATION_REMOVED+LOCATION_GRAVE+LOCATION_ONFIELD,nil)*200
+	return Duel.GetMatchingGroupCount(cm.atkfilter,e:GetHandlerPlayer(),0,LOCATION_REMOVED+LOCATION_GRAVE+LOCATION_ONFIELD,nil)*200
 end
 function cm.value1(e,c)
-	return Duel.GetMatchingGroupCount(cm.atkfilter,c:GetControler(),0,LOCATION_REMOVED+LOCATION_GRAVE+LOCATION_ONFIELD,nil)*(-200)
+	return Duel.GetMatchingGroupCount(cm.atkfilter,e:GetHandlerPlayer(),0,LOCATION_REMOVED+LOCATION_GRAVE+LOCATION_ONFIELD,nil)*(-200)
 end
 function cm.desfilter(c)
 	return c:IsType(TYPE_SPELL+TYPE_TRAP)

expansions/script/c9310000.lua

 --单调原点·联动魔方
 function c9310000.initial_effect(c)
-	aux.AddCodeList(c,9310000,9310027)
+	aux.AddCodeList(c,9310000,9310027,9310050)
 	c:EnableReviveLimit()
 	--ritual summon
 	local e1=Effect.CreateEffect(c)