fix

expansions/script/c11450993.lua

@@ -38,7 +38,7 @@ function cm.regop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.spfilter0(c,loc)
-	return not c:IsLocation(loc) and c:IsPreviousLocation(loc)
+	return c:IsPreviousLocation(loc) and not (c:IsLocation(loc) and c:IsControler(c:GetPreviousControler()))
 end
 function cm.adcon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(Card.IsType,1,nil,TYPE_MONSTER)

expansions/script/c11451448.lua

 --革命的准备
-local m=11451448
-local cm=_G["c"..m]
+local cm,m=GetID()
 function cm.initial_effect(c)
 	aux.AddCodeList(c,99518961)
 	--activate
@@ -35,7 +34,7 @@ function cm.activate(e,tp,eg,ep,ev,re,r,rp)
 		if Duel.SendtoHand(sg1,nil,REASON_EFFECT)>0 then
 			Duel.ConfirmCards(1-tp,sg1)
 			local ct=Duel.GetFieldGroupCount(tp,LOCATION_HAND,0)-Duel.GetFieldGroupCount(tp,0,LOCATION_HAND)
-			if ct>0 and Duel.IsPlayerCanDraw(1-tp,ct) then
+			if ct>0 then --and Duel.IsPlayerCanDraw(1-tp,ct) then
 				Duel.Draw(1-tp,ct,REASON_EFFECT)
 			end
 		end

expansions/script/c11451565.lua

@@ -78,7 +78,7 @@ function cm.acfilter(c,tp)
 	return c:IsPreviousControler(tp) and c:GetEquipTarget()
 end
 function cm.accon(e,tp,eg,ep,ev,re,r,rp)
-	return eg:IsExists(cm.acfilter,1,nil,tp) and not eg:IsContains(e:GetHandler())
+	return eg:IsExists(cm.acfilter,1,nil,tp) and (not eg:IsContains(e:GetHandler()) or e:GetHandler():IsLocation(LOCATION_HAND))
 end
 function cm.accost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local exc=(e:GetHandler():IsLocation(LOCATION_HAND) and not e:GetHandler():IsAbleToGraveAsCost()) and e:GetHandler() or nil

expansions/script/c11451842.lua

@@ -17,6 +17,7 @@ function cm.initial_effect(c)
 end
 function cm.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return e:GetHandler():IsAbleToRemoveAsCost(POS_FACEDOWN) end
+	Duel.ConfirmCards(1-tp,e:GetHandler())
 	Duel.Remove(e:GetHandler(),POS_FACEDOWN,REASON_COST)
 end
 function cm.filter(c,code)

expansions/script/c11451906.lua

@@ -20,6 +20,7 @@ function cm.initial_effect(c)
 	c:RegisterEffect(e2)
 	local e5=e2:Clone()
 	e5:SetDescription(0)
+	e5:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_TRIGGER_O)
 	e5:SetCode(EVENT_CUSTOM+11451902)
 	e5:SetCondition(aux.TRUE)
 	e5:SetCost(aux.TRUE)

expansions/script/c16104608.lua

@@ -36,6 +36,7 @@ function c16104608.initial_effect(c)
 	e3:SetTarget(c16104608.destg)
 	e3:SetOperation(c16104608.desop)
 	c:RegisterEffect(e3)
+   
 end
 function c16104608.condition(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():IsFacedown()
@@ -93,6 +94,25 @@ function c16104608.filter4(c)
 	return c:IsFacedown() 
 end
 function c16104608.hspop(e,tp,eg,ep,ev,re,r,rp)
+	 local c=e:GetHandler()
+	 local e0=Effect.CreateEffect(c)
+		e0:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
+		e0:SetCode(EVENT_SUMMON_SUCCESS)
+		e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_OATH)
+		e0:SetCountLimit(1,98500510)
+		e0:SetReset(RESET_EVENT+0x7e0000+RESET_PHASE+PHASE_END)
+		e0:SetOperation(c16104608.efilter)
+		c:RegisterEffect(e0)
+	local e4=Effect.CreateEffect(c)
+		e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
+		e4:SetCode(EVENT_MSET)
+		e4:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_OATH)
+		e4:SetCountLimit(1,98500510)
+		e4:SetReset(RESET_PHASE+PHASE_END)
+	 -- e4:SetLabelObject(c)
+		e4:SetOperation(c16104608.efilter)
+		Duel.RegisterEffect(e4,tp)
+	Duel.BreakEffect()
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<1 then return false end
 	local ts={}
 	local index=1
@@ -114,12 +134,14 @@ function c16104608.hspop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) and tc:IsFaceup() then
 		if Duel.ChangePosition(tc,POS_FACEDOWN_DEFENSE)~=0 then
-			Duel.BreakEffect()
-			local g2=Duel.GetMatchingGroup(c16104608.filter4,tp,LOCATION_MZONE,0,nil)
-				Duel.ShuffleSetCard(g2)
+		   
 		end
 	end
 end
+function c16104608.efilter(e,tp,eg,ep,ev,re,r,rp)
+	local g2=Duel.GetMatchingGroup(c16104608.filter4,tp,LOCATION_MZONE,0,nil)
+			 Duel.ShuffleSetCard(g2)
+end
 function c16104608.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,nil,1,0,0)

expansions/script/c16104610.lua

@@ -92,6 +92,25 @@ function c16104610.filter4(c)
 	return c:IsFacedown()
 end
 function c16104610.hspop(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetHandler()
+	 local e0=Effect.CreateEffect(c)
+		e0:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
+		e0:SetCode(EVENT_SUMMON_SUCCESS)
+		e0:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_OATH)
+		e0:SetCountLimit(1,98500520)
+		e0:SetReset(RESET_EVENT+0x7e0000)
+		e0:SetOperation(c16104610.efilter)
+		c:RegisterEffect(e0)
+	local e4=Effect.CreateEffect(c)
+		e4:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_CONTINUOUS)
+		e4:SetCode(EVENT_MSET)
+		e4:SetProperty(EFFECT_FLAG_CANNOT_DISABLE+EFFECT_FLAG_OATH)
+		e4:SetCountLimit(1,98500520)
+		e4:SetReset(RESET_PHASE+PHASE_END)
+	 -- e4:SetLabelObject(c)
+		e4:SetOperation(c16104610.efilter)
+		Duel.RegisterEffect(e4,tp)
+	Duel.BreakEffect()
 	if Duel.GetLocationCount(tp,LOCATION_MZONE)<1 then return false end
 	local ts={}
 	local index=1
@@ -113,12 +132,14 @@ function c16104610.hspop(e,tp,eg,ep,ev,re,r,rp)
 	local tc=Duel.GetFirstTarget()
 	if tc:IsRelateToEffect(e) and tc:IsFaceup() then
 		if Duel.ChangePosition(tc,POS_FACEDOWN_DEFENSE)~=0 then
-			Duel.BreakEffect()
-			local g2=Duel.GetMatchingGroup(c16104610.filter4,tp,LOCATION_MZONE,0,nil)
-				Duel.ShuffleSetCard(g2)
+		   
 		end
 	end
 end
+function c16104610.efilter(e,tp,eg,ep,ev,re,r,rp)
+	local g2=Duel.GetMatchingGroup(c16104610.filter4,tp,LOCATION_MZONE,0,nil)
+			 Duel.ShuffleSetCard(g2)
+end
 function c16104610.destg(e,tp,eg,ep,ev,re,r,rp,chk)
 	if chk==0 then return true end
 	Duel.SetOperationInfo(0,CATEGORY_DESTROY,nil,1,0,0)

expansions/script/c16670025.lua

@@ -34,16 +34,16 @@ function cm.initial_effect(c)
 	e22:SetValue(TYPE_PENDULUM)
 	--c:RegisterEffect(e22)
 	--魔法发动
+	if not cm.global_jc then
+		cm.global_jc={}
+	end
     local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(m,2))
 	e2:SetType(EFFECT_TYPE_QUICK_O)
 	e2:SetRange(LOCATION_HAND)
 	e2:SetProperty(EFFECT_FLAG_UNCOPYABLE+EFFECT_FLAG_SET_AVAILABLE+EFFECT_FLAG_DAMAGE_STEP)
-	--
-	--e2:SetType(EFFECT_TYPE_ACTIVATE)
 	e2:SetCode(EVENT_FREE_CHAIN)
 	e2:SetHintTiming(0,TIMINGS_CHECK_MONSTER+TIMING_END_PHASE)
-	--e2:SetLabel(m)
 	e2:SetCondition(cm.backon4)
 	e2:SetCost(cm.cost1)
 	e2:SetTarget(cm.target)
@@ -54,13 +54,8 @@ function cm.initial_effect(c)
 	e6:SetCondition(cm.backon3)
 	e6:SetRange(LOCATION_SZONE)
 	c:RegisterEffect(e6)
-	local l=Effect.IsHasType
-	Effect.IsHasType=function(ea,le)
-		if (ea==e2 or ea==e6) and le==EFFECT_TYPE_ACTIVATE then
-			return true
-		end
-			return l(ea,le)
-		end
+	cm.global_jc[#cm.global_jc+1]=e2
+	cm.global_jc[#cm.global_jc+1]=e6
 	--模仿开
 	local e27=e2:Clone()
 	e27:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_F)
@@ -68,7 +63,7 @@ function cm.initial_effect(c)
 	e27:SetCondition(aux.TRUE)
 	e27:SetCode(m+3)
 	e27:SetCost(cm.cost)
-	c:RegisterEffect(e27)
+	--c:RegisterEffect(e27)
 	--模仿变
 	local ez=Effect.CreateEffect(c)
 	ez:SetDescription(aux.Stringid(m,2))
@@ -189,6 +184,15 @@ function cm.initial_effect(c)
 		local e37=ge13:Clone()
 		e37:SetLabelObject(e19)
 		Duel.RegisterEffect(e37,0)
+
+		local l2=Card.GetActivateEffect
+		Card.GetActivateEffect=function(ca)
+			if c==ca then
+				return e2,e6
+			end
+				return l2(ca)
+			end
+
     if not cm.global_check then
 		cm.global_check=true
 		cm.gx=nil
@@ -207,11 +211,39 @@ function cm.initial_effect(c)
         ge12:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 		ge12:SetTarget(cm.spcon12)
 		ge12:SetOperation(cm.dp1)
-		--Duel.RegisterEffect(ge12,0)
+		Duel.RegisterEffect(ge12,0)
 		--
+		local l=Effect.IsHasType
+		Effect.IsHasType=function(ea,le)
+			for i = 0, #cm.global_jc do
+				if cm.global_jc[i] == ea and le==EFFECT_TYPE_ACTIVATE then
+					return true
+				end
+			end
+				return l(ea,le)
+			end
+		--
+		local l3=Effect.Clone
+		Effect.Clone=function(ea)
+			for i = 0, #cm.global_jc do
+				if cm.global_jc[i] == ea then
+					local yb=l3(ea)
+					local ge1=Effect.CreateEffect(c)
+					ge1:SetType(EFFECT_TYPE_FIELD)
+					ge1:SetCode(EFFECT_ACTIVATE_COST)
+					ge1:SetLabelObject(yb)
+					ge1:SetTargetRange(1,1)
+					ge1:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
+					ge1:SetTarget(cm.actarget)
+					ge1:SetOperation(cm.checkop)
+					Duel.RegisterEffect(ge1,0)
+					return yb
+				end
+			end
+				return l3(ea)
+			end
 	end
 end
-if not Card.SetEntityCode then Card.SetEntityCode=aux.TRUE end
 function cm.spfilter(c,e,tp)
 	return c:IsType(TYPE_SPELL) or c:IsType(TYPE_TRAP)
 end
@@ -268,19 +300,19 @@ function cm.checkop1(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.con(e,tp)
-	pcall(Duel.DisableActionCheck,true)
+	Duel.DisableActionCheck(true)
 	local dc=Duel.CreateToken(tp,m+1)
 	local res=dc:GetActivateEffect():IsActivatable(tp,false,false)
-	pcall(Duel.DisableActionCheck,false)
+	Duel.DisableActionCheck(false)
 	return res and Duel.GetCurrentPhase()~=PHASE_DAMAGE_CAL
 	and Duel.GetCurrentPhase()~=PHASE_DAMAGE-- and Duel.GetCurrentPhase()~=PHASE_BATTLE_STEP
 	and Duel.GetFlagEffect(tp,m+2)==0
 end
 function cm.con1(e,tp)
-	pcall(Duel.DisableActionCheck,true)
+	Duel.DisableActionCheck(true)
 	local dc=Duel.CreateToken(tp,m+1)
 	local res=dc:GetActivateEffect():IsActivatable(tp,false,false)
-	pcall(Duel.DisableActionCheck,false)
+	Duel.DisableActionCheck(false)
 	return res and Duel.SelectYesNo(tp,aux.Stringid(m,3))
 end
 function cm.op(e,tp,eg,ep,ev,re,r,rp)
@@ -330,6 +362,7 @@ function cm.op(e,tp,eg,ep,ev,re,r,rp)
 	--
 	e:GetLabelObject():SetLabelObject(g)
 	]]--
+	c:CreateEffectRelation(e)
 	Duel.RaiseSingleEvent(c,m+3,re,r,tp,tp,ev)
 end
 --魔法变相同部分
@@ -461,6 +494,7 @@ function cm.checkop(e,tp,eg,ep,ev,re,r,rp)
 	cm.gz=g:GetOriginalCode()
     --Duel.AdjustAll()
 	]]--
+	c:CreateEffectRelation(e:GetLabelObject())
 end
 --怪兽变
 function cm.checkop2(e,tp,eg,ep,ev,re,r,rp)
@@ -533,8 +567,7 @@ function cm.reg2(c,e,ob)
 	--
 	e:SetReset(RESET_EVENT+RESETS_STANDARD-RESET_TOFIELD)
 	e:SetOperation(cm.pr)
-	local qi,da=nil,nil
-	if Effect.GetCountLimit then qi,da=e:GetCountLimit() end
+	local qi,da=e:GetCountLimit()
 	if qi~=nil and da==nil then
 		e:SetCountLimit(qi)
 	elseif qi~=nil and da~=nil then

expansions/script/c40009036.lua

@@ -81,6 +81,7 @@ function c40009036.operation(e,tp,eg,ep,ev,re,r,rp)
 	if not c:IsLocation(LOCATION_SZONE) then return end
 	if not c:IsRelateToEffect(e) or c:IsStatus(STATUS_LEAVE_CONFIRMED) then return end
 		Duel.BreakEffect()
+		Duel.SkipPhase(1-tp,PHASE_BATTLE,RESET_PHASE+PHASE_BATTLE_STEP,1)
 		Duel.Equip(tp,c,tc)
 		local e2=Effect.CreateEffect(c)
 		e2:SetType(EFFECT_TYPE_EQUIP)

expansions/script/c40009037.lua

@@ -83,10 +83,9 @@ function c40009037.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
 	local tc=Duel.GetFirstTarget()
 	if Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) and Duel.Destroy(eg,REASON_EFFECT)~=0 and tc:IsRelateToEffect(e) and tc:IsFaceup() then
-		Duel.BreakEffect()
-		Duel.SkipPhase(1-tp,PHASE_BATTLE,RESET_PHASE+PHASE_BATTLE_STEP,1)
 	if not c:IsLocation(LOCATION_SZONE) then return end
 	if not c:IsRelateToEffect(e) or c:IsStatus(STATUS_LEAVE_CONFIRMED) then return end
+		Duel.BreakEffect()
 		Duel.Equip(tp,c,tc)
 		local e2=Effect.CreateEffect(c)
 		e2:SetType(EFFECT_TYPE_EQUIP)

expansions/script/c50203210.lua

@@ -67,7 +67,7 @@ function c50203210.sccon(e,tp,eg,ep,ev,re,r,rp)
 	return eg:IsExists(Card.IsSummonPlayer,1,nil,1-tp)
 end
 function c50203210.mfilter(c)
-	return c:IsSetCard(0x3b) and c:IsType(TYPE_MONSTER)
+	return c:IsSetCard(0x3b) and c:IsType(TYPE_MONSTER) and c:IsFaceup()
 end
 function c50203210.cfilter(c,syn)
 	return syn:IsSynchroSummonable(c)

expansions/script/c9910436.lua

@@ -21,18 +21,16 @@ function c9910436.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 function c9910436.atkcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetSummonType()==SUMMON_TYPE_LINK and Duel.IsAbleToEnterBP()
-end
-function c9910436.cfilter(c,e)
-	return c:IsAbleToGrave() and not c:IsImmuneToEffect(e)
+	return e:GetHandler():GetSummonType()==SUMMON_TYPE_LINK
 end
 function c9910436.atkop(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if Duel.IsExistingMatchingCard(c9910436.cfilter,tp,LOCATION_ONFIELD+LOCATION_HAND,0,1,c,e)
+	if Duel.IsExistingMatchingCard(Card.IsAbleToGrave,tp,LOCATION_ONFIELD+LOCATION_HAND,0,1,c)
 		and c:IsFaceup() and Duel.SelectYesNo(tp,aux.Stringid(9910436,0)) then
 		Duel.Hint(HINT_CARD,0,9910436)
 		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_TOGRAVE)
-		local cg=Duel.SelectMatchingCard(tp,c9910436.cfilter,tp,LOCATION_ONFIELD+LOCATION_HAND,0,1,63,c,e)
+		local cg=Duel.SelectMatchingCard(tp,Card.IsAbleToGrave,tp,LOCATION_ONFIELD+LOCATION_HAND,0,1,63,c)
+		Duel.HintSelection(cg)
 		Duel.SendtoGrave(cg,REASON_EFFECT)
 		local oc=Duel.GetOperatedGroup():FilterCount(Card.IsLocation,nil,LOCATION_GRAVE)
 		local e1=Effect.CreateEffect(c)