eme

expansions/script/c12045011.lua

@@ -7,7 +7,7 @@ function cm.initial_effect(c)
 	--tohand
 	local e1=Effect.CreateEffect(c)
 	e1:SetDescription(aux.Stringid(m,0))
-	e1:SetCategory(CATEGORY_TOHAND)
+	e1:SetCategory(CATEGORY_SEARCH+CATEGORY_TOHAND)
 	e1:SetType(EFFECT_TYPE_IGNITION)
 	e1:SetRange(LOCATION_PZONE)
 	e1:SetCountLimit(1,m)

expansions/script/c16150018.lua

@@ -36,7 +36,7 @@ function cm.initial_effect(c)
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(aux.Stringid(m,2))
 	e4:SetCategory(CATEGORY_CONTROL+CATEGORY_EQUIP)
-	e4:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
+	e4:SetType(EFFECT_TYPE_QUICK_O)
 	e4:SetCode(EVENT_SPSUMMON)
 	e4:SetRange(LOCATION_MZONE)
 	e4:SetCountLimit(1,100+m)
@@ -51,7 +51,7 @@ function cm.initial_effect(c)
 	--equip
 	local e5=Effect.CreateEffect(c)
 	e5:SetDescription(aux.Stringid(m,3))
-	e5:SetCategory(CATEGORY_DISABLE+CATEGORY_REMOVE)
+	e5:SetCategory(CATEGORY_EQUIP)
 	e5:SetType(EFFECT_TYPE_QUICK_O)
 	e5:SetCode(EVENT_FREE_CHAIN)
 	e5:SetRange(LOCATION_MZONE)

expansions/script/c33200105.lua

@@ -61,7 +61,7 @@ function c33200105.filter2(c,e,code)
 	return c:IsCode(code) and c:IsCanBeSpecialSummoned(e,0,tp,false,false,POS_FACEUP_DEFENSE)
 end
 function c33200105.smtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chkc then return chkc:IsLocation(LOCATION_GRAVE) and chkc:IsControler(tp) and c33200105.filter(chkc,tp) end
+	if chkc then return chkc:IsLocation(LOCATION_MZONE) and chkc:IsControler(tp) end
 	if chk==0 then return Duel.IsExistingMatchingCard(c33200105.filter,tp,LOCATION_GRAVE,0,1,nil,e,tp) 
 	and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 end
 	Duel.Hint(HINT_SELECTMSG,tp,aux.Stringid(33200105,0))

expansions/script/c33710903.lua

@@ -10,18 +10,28 @@ function c33710903.initial_effect(c)
 	c:RegisterEffect(e1) 
 	if not c33710903.global_check then
 		c33710903.global_check=true
+		Count_Time_For_This_Effect={0,0,0,0}
 		local ge1=Effect.CreateEffect(c)
 		ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 		ge1:SetCode(EVENT_CHAINING)
 		ge1:SetOperation(c33710903.checkop)
 		Duel.RegisterEffect(ge1,0)
+		local ge2=Effect.CreateEffect(c)
+		ge2:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+		ge2:SetCode(EVENT_TURN_END)
+		ge2:SetOperation(c33710903.checkop2)
+		Duel.RegisterEffect(ge2,0)
 	end
 end
 function c33710903.checkop(e,tp,eg,ep,ev,re,r,rp)
-	local tc=re:GetHandler()
-	if tc then
-		Duel.RegisterFlagEffect(re:GetHandler():GetControler(),16133710903+Duel.GetTurnCount(),RESET_PHASE+PHASE_END,0,2)
-	end
+	Count_Time_For_This_Effect[re:GetHandlerPlayer()+3]=Count_Time_For_This_Effect[re:GetHandlerPlayer()+3]+1
+end
+function c33710903.checkop2(e,tp,eg,ep,ev,re,r,rp)
+	Debug.Message(0)
+	Count_Time_For_This_Effect[1]=Count_Time_For_This_Effect[3]
+	Count_Time_For_This_Effect[2]=Count_Time_For_This_Effect[4]
+	Count_Time_For_This_Effect[3]=0
+	Count_Time_For_This_Effect[4]=0
 end
 function c33710903.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>0 end
@@ -60,11 +70,11 @@ function c33710903.actlimit(e,te,tp)
 end
 function c33710903.sptg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
-	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,0,0,1-tp,Duel.GetFlagEffect(1-tp,16133710903+Duel.GetTurnCount()-1)*500)
+	Duel.SetOperationInfo(0,CATEGORY_DAMAGE,0,0,1-tp,Count_Time_For_This_Effect[2-tp]*500)
 end
 function c33710903.spop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	Duel.Damage(1-tp,Duel.GetFlagEffect(1-tp,16133710903+Duel.GetTurnCount()-1)*500,REASON_EFFECT)
+	Duel.Damage(1-tp,Count_Time_For_This_Effect[2-tp]*500,REASON_EFFECT)
 	if c:IsRelateToEffect(e) then
 		Duel.ShuffleHand(tp)
 	end

expansions/script/c85401420.lua

@@ -42,10 +42,10 @@ function c85401420.reck(e,c,sump,sumtype,sumpos,targetp)
 	return c:IsCode(85401420)
 end
 function c85401420.con(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetFlagEffect(85401700)==1
+	return e:GetHandler():GetFlagEffect(85401700)>0
 end
 function c85401420.pcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetFlagEffect(85401700)==1
+	return e:GetHandler():GetFlagEffect(85401700)>0
 end
 function c85401420.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
@@ -71,7 +71,7 @@ end
 
 function c85401420.spcon(e,c)
 	if c==nil then return true end
-	return e:GetHandler():GetFlagEffect(85401700)==1
+	return e:GetHandler():GetFlagEffect(85401700)>0
 end
 
 

expansions/script/c85401460.lua

@@ -39,10 +39,10 @@ function c85401460.reck(e,c,sump,sumtype,sumpos,targetp)
 	return c:IsCode(85401460)
 end
 function c85401460.con(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetFlagEffect(85401700)==1
+	return e:GetHandler():GetFlagEffect(85401700)>0
 end
 function c85401460.dcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetFlagEffect(85401700)==1
+	return e:GetHandler():GetFlagEffect(85401700)>0
 end
 function c85401460.tg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
@@ -63,5 +63,5 @@ function c85401460.op(e,tp,eg,ep,ev,re,r,rp)
 end
 function c85401460.spcon(e,c)
 	if c==nil then return true end
-	return e:GetHandler():GetFlagEffect(85401700)==1
+	return e:GetHandler():GetFlagEffect(85401700)>0
 end
\ No newline at end of file