fix

expansions/script/c11451731.lua

@@ -42,7 +42,7 @@ end
 function cm.chkop(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if c:IsReason(REASON_DISCARD) then
-		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(11451742,0))
+		c:RegisterFlagEffect(0,RESET_EVENT+0x1f20000,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(11451742,0))
 	end
 end
 function cm.limit(e,tp,eg,ep,ev,re,r,rp)
@@ -101,7 +101,7 @@ function cm.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 	e1:SetDescription(aux.Stringid(11451731,ct))
 	e1:SetLabel(flag)
 	e1:SetType(EFFECT_TYPE_FIELD)
-	e1:SetCode(0x20000000+11451731)
+	e1:SetCode(EFFECT_FLAG_EFFECT+11451731)
 	e1:SetProperty(EFFECT_FLAG_PLAYER_TARGET+EFFECT_FLAG_CLIENT_HINT)
 	e1:SetTargetRange(1,0)
 	e1:SetReset(RESET_PHASE+PHASE_END)

expansions/script/c11451734.lua

@@ -38,11 +38,28 @@ function cm.initial_effect(c)
 		ge1:SetOperation(cm.limit)
 		Duel.RegisterEffect(ge1,0)
 	end
+	if not cm.global_check then
+		cm.global_check=true
+		local ge1=Effect.CreateEffect(c)
+		ge1:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
+		ge1:SetCode(EVENT_DISCARD)
+		ge1:SetOperation(cm.checkop)
+		Duel.RegisterEffect(ge1,0)
+	end
 end
 function cm.chkop(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if c:IsReason(REASON_DISCARD) then
-		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(11451742,0))
+		c:RegisterFlagEffect(0,RESET_EVENT+0x1f20000,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(11451742,0))
+	end
+end
+function cm.checkop(e,tp,eg,ep,ev,re,r,rp)
+	local tc=eg:GetFirst()
+	while tc do
+		if tc:IsLocation(LOCATION_GRAVE+LOCATION_REMOVED) then
+			tc:RegisterFlagEffect(m-1,RESET_EVENT+0x1f20000,0,1)
+		end
+		tc=eg:GetNext()
 	end
 end
 function cm.limit(e,tp,eg,ep,ev,re,r,rp)
@@ -127,7 +144,7 @@ function cm.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function cm.mfilter(c)
-	return (c:IsFaceup() or c:IsLocation(LOCATION_GRAVE)) and c:IsReason(REASON_DISCARD) and c:IsType(TYPE_MONSTER)
+	return (c:IsFaceup() or c:IsLocation(LOCATION_GRAVE)) and (c:IsReason(REASON_DISCARD) or c:GetFlagEffect(m-1)>0) and c:IsType(TYPE_MONSTER)
 end
 function cm.spfilter(c,e,tp,m,f,chkf)
 	return c:IsType(TYPE_FUSION) and (not f or f(c)) and c:IsCanBeSpecialSummoned(e,SUMMON_TYPE_FUSION,tp,false,false) and c:CheckFusionMaterial(m,nil,chkf)

expansions/script/c11451735.lua

@@ -25,7 +25,7 @@ if Card.SetEntityCode then KOISHI_CHECK=true end
 function cm.chkop(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if c:IsReason(REASON_DISCARD) then
-		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(11451742,0))
+		c:RegisterFlagEffect(0,RESET_EVENT+0x1f20000,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(11451742,0))
 	end
 end
 function cm.filter(c)

expansions/script/c11451736.lua

@@ -25,7 +25,7 @@ if Card.SetEntityCode then KOISHI_CHECK=true end
 function cm.chkop(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if c:IsReason(REASON_DISCARD) then
-		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(11451742,0))
+		c:RegisterFlagEffect(0,RESET_EVENT+0x1f20000,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(11451742,0))
 	end
 end
 function cm.filter(c)

expansions/script/c11451737.lua

@@ -25,7 +25,7 @@ if Card.SetEntityCode then KOISHI_CHECK=true end
 function cm.chkop(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if c:IsReason(REASON_DISCARD) then
-		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(11451742,0))
+		c:RegisterFlagEffect(0,RESET_EVENT+0x1f20000,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(11451742,0))
 	end
 end
 function cm.filter(c)

expansions/script/c11451738.lua

@@ -25,7 +25,7 @@ if Card.SetEntityCode then KOISHI_CHECK=true end
 function cm.chkop(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()
 	if c:IsReason(REASON_DISCARD) then
-		c:RegisterFlagEffect(0,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(11451742,0))
+		c:RegisterFlagEffect(0,RESET_EVENT+0x1f20000,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(11451742,0))
 	end
 end
 function cm.filter(c)

expansions/script/c13020032.lua

 --阅后即焚
 local s,id,o=GetID()
 function s.initial_effect(c)
-    aux.AddCodeList(c,13020040)
-    --SearchCard
+	aux.AddCodeList(c,13020040)
+	c:EnableReviveLimit()
+	--SearchCard
 	local e1=Effect.CreateEffect(c)
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_RELEASE)
 	e1:SetType(EFFECT_TYPE_TRIGGER_O+EFFECT_TYPE_SINGLE)
 	e1:SetCode(EVENT_SPSUMMON_SUCCESS)
-    e1:SetProperty(EFFECT_FLAG_DELAY)
+	e1:SetProperty(EFFECT_FLAG_DELAY)
 	e1:SetTarget(s.thtg)
 	e1:SetOperation(s.thop)
 	c:RegisterEffect(e1)
-    --negate
+	--negate
 	local e3=Effect.CreateEffect(c)
 	e3:SetCategory(CATEGORY_NEGATE+CATEGORY_DESTROY+CATEGORY_RELEASE)
 	e3:SetType(EFFECT_TYPE_QUICK_O)
 	e3:SetCode(EVENT_CHAINING)
 	e3:SetProperty(EFFECT_FLAG_DAMAGE_STEP+EFFECT_FLAG_DAMAGE_CAL)
 	e3:SetRange(LOCATION_HAND)
-    e3:SetCondition(s.discon)
-    e3:SetCost(s.htgcost)
+	e3:SetCondition(s.discon)
+	e3:SetCost(s.htgcost)
 	e3:SetTarget(s.distg)
 	e3:SetOperation(s.disop)
 	c:RegisterEffect(e3)
@@ -38,38 +39,38 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 	local g=Duel.SelectMatchingCard(tp,s.filter,tp,LOCATION_DECK,0,1,1,nil)
 	if g:GetCount()>0 and Duel.SendtoHand(g,nil,REASON_EFFECT)>0 then
-        local tc=g:GetFirst()
+		local tc=g:GetFirst()
 		if tc:IsLocation(0x02) then
-            Duel.ConfirmCards(1-tp,tc)
-            Duel.ShuffleHand(tp)
-            Duel.BreakEffect()
-            local g1=Duel.GetMatchingGroup(s.rlfi2ter,tp,0x04,0,nil)
-            local g2=Duel.GetMatchingGroup(s.rlfi2ter,1-tp,0x04,0,nil)
-            local rg=Group.CreateGroup()
-            if #g1>0 then
-                Duel.Hint(3,tp,500)
-                local sg=g1:Select(tp,1,1,nil)
-                Duel.HintSelection(sg)
-                rg:Merge(sg)
-            end
-            if #g2>0 then
-                Duel.Hint(3,tp,500)
-                local sg=g2:Select(1-tp,1,1,nil)
-                Duel.HintSelection(sg)
-                rg:Merge(sg)
-            end
-            if #rg>0 then Duel.Release(rg,0x40) end
-        end
+			Duel.ConfirmCards(1-tp,tc)
+			Duel.ShuffleHand(tp)
+			Duel.BreakEffect()
+			local g1=Duel.GetMatchingGroup(s.rlfi2ter,tp,0x04,0,nil)
+			local g2=Duel.GetMatchingGroup(s.rlfi2ter,1-tp,0x04,0,nil)
+			local rg=Group.CreateGroup()
+			if #g1>0 then
+				Duel.Hint(3,tp,500)
+				local sg=g1:Select(tp,1,1,nil)
+				Duel.HintSelection(sg)
+				rg:Merge(sg)
+			end
+			if #g2>0 then
+				Duel.Hint(3,tp,500)
+				local sg=g2:Select(1-tp,1,1,nil)
+				Duel.HintSelection(sg)
+				rg:Merge(sg)
+			end
+			if #rg>0 then Duel.Release(rg,0x40) end
+		end
 	end
 end
 function s.discon(e,tp,eg,ep,ev,re,r,rp)
 	return not e:GetHandler():IsStatus(STATUS_BATTLE_DESTROYED)
-        and Duel.IsChainNegatable(ev) and rp==1-tp
+		and Duel.IsChainNegatable(ev) and rp==1-tp
 end
 function s.htgcost(e,tp,eg,ep,ev,re,r,rp,chk)
-    local c=e:GetHandler()
+	local c=e:GetHandler()
 	if chk==0 then return not c:IsPublic() end
-    c:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,fid,66)
+	c:RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,EFFECT_FLAG_CLIENT_HINT,1,fid,66)
 	local e1=Effect.CreateEffect(c)
 	e1:SetType(EFFECT_TYPE_SINGLE)
 	e1:SetCode(EFFECT_PUBLIC)
@@ -87,8 +88,8 @@ function s.ckfi1ter(c)
 	return c:GetSequence()==0
 end
 function s.rfilter(c)
-    return c:IsType(TYPE_RITUAL)
-        and (c:IsType(TYPE_MONSTER) or c:IsType(TYPE_SPELL))
+	return c:IsType(TYPE_RITUAL)
+		and (c:IsType(TYPE_MONSTER) or c:IsType(TYPE_SPELL))
 end
 function s.sfi1ter(c,e) 
 	return s.rfilter(c) and (c:IsReleasableByEffect() or c:IsDestructable(e))
@@ -100,47 +101,47 @@ function s.sfi3ter(c,e)
 	return c:IsDestructable(e) and s.rfilter(c)
 end
 function s.disop(e,tp,eg,ep,ev,re,r,rp)
-    local c=e:GetHandler()
+	local c=e:GetHandler()
 	local g=Duel.GetMatchingGroup(s.ckfi1ter,tp,0x01,0,nil)
-    local NgCheck=false
-    if #g>0 then
-        local tc=g:GetFirst()
-        Duel.MoveSequence(tc,SEQ_DECKTOP)
-        Duel.ConfirmDecktop(tp,2)
-        local hg=Duel.GetFieldGroup(tp,0x02,0)
-        local dg=Duel.GetDecktopGroup(tp,2)
-        dg:Merge(hg)
-        local cg=dg:Filter(s.sfi1ter,nil,e)
-        local rcg=dg:Filter(s.sfi2ter,nil)
-        local dcg=dg:Filter(s.sfi3ter,nil,e)
-        local erg=Group.CreateGroup()
-        local edg=Group.CreateGroup()
-        if #cg>=3 then
-            if #rcg>0 and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
-                local min=3-#dcg
-                if min<1 then min=1 end
-                local max=#rcg
-                if max>3 then max=3 end
-                Duel.Hint(3,tp,500)
-                erg=rcg:Select(tp,min,max,nil)
-            end
-            if #erg<=3 and (#erg~=0 or (#dcg>=3 and Duel.SelectYesNo(tp,aux.Stringid(id,1)))) then
-                local val=3-#erg
-                Duel.Hint(3,tp,502)
-                edg=dcg:Select(tp,val,val,nil)
-            end
-        end
-        if tc:IsLocation(0x01) then
-            Duel.MoveSequence(tc,SEQ_DECKBOTTOM)
-        end
-        if #edg+#erg==3 then
-            Duel.DisableShuffleCheck()
-            local dv=Duel.Release(erg,0x40)
-            Duel.DisableShuffleCheck()
-            local dr=Duel.Destroy(edg,0x40)
-            if dv+dr==3 then NgCheck=true end
-        end
-    end
+	local NgCheck=false
+	if #g>0 then
+		local tc=g:GetFirst()
+		Duel.MoveSequence(tc,SEQ_DECKTOP)
+		Duel.ConfirmDecktop(tp,2)
+		local hg=Duel.GetFieldGroup(tp,0x02,0)
+		local dg=Duel.GetDecktopGroup(tp,2)
+		dg:Merge(hg)
+		local cg=dg:Filter(s.sfi1ter,nil,e)
+		local rcg=dg:Filter(s.sfi2ter,nil)
+		local dcg=dg:Filter(s.sfi3ter,nil,e)
+		local erg=Group.CreateGroup()
+		local edg=Group.CreateGroup()
+		if #cg>=3 then
+			if #rcg>0 and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
+				local min=3-#dcg
+				if min<1 then min=1 end
+				local max=#rcg
+				if max>3 then max=3 end
+				Duel.Hint(3,tp,500)
+				erg=rcg:Select(tp,min,max,nil)
+			end
+			if #erg<=3 and (#erg~=0 or (#dcg>=3 and Duel.SelectYesNo(tp,aux.Stringid(id,1)))) then
+				local val=3-#erg
+				Duel.Hint(3,tp,502)
+				edg=dcg:Select(tp,val,val,nil)
+			end
+		end
+		if tc:IsLocation(0x01) then
+			Duel.MoveSequence(tc,SEQ_DECKBOTTOM)
+		end
+		if #edg+#erg==3 then
+			Duel.DisableShuffleCheck()
+			local dv=Duel.Release(erg,0x40)
+			Duel.DisableShuffleCheck()
+			local dr=Duel.Destroy(edg,0x40)
+			if dv+dr==3 then NgCheck=true end
+		end
+	end
 	if NgCheck and Duel.NegateActivation(ev) and re:GetHandler():IsRelateToEffect(re) then
 		Duel.Destroy(eg,REASON_EFFECT)
 	end

expansions/script/c89390101.lua

@@ -41,12 +41,8 @@ end
 function s.addop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_CARD,0,id)
 	local g=Duel.GetFieldGroup(tp,0,LOCATION_HAND)
-	if g:GetCount()>0 then
-		Duel.ConfirmCards(tp,g)
-		Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_DISCARD)
-		local sg=g:Select(tp,1,1,nil)
-		Duel.SendtoGrave(sg,REASON_EFFECT+REASON_DISCARD)
-		Duel.ShuffleHand(1-tp)
-	end
+	if g:GetCount()==0 then return end
+	local sg=g:RandomSelect(tp,1)
+	Duel.SendtoGrave(sg,REASON_DISCARD+REASON_EFFECT)
 	e:GetHandler():RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END,0,1)
 end

expansions/script/c89390102.lua

@@ -14,10 +14,9 @@ function s.initial_effect(c)
 	c:RegisterEffect(e2)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(id,0))
-	e2:SetCategory(CATEGORY_RELEASE+CATEGORY_DRAW)
+	e2:SetCategory(CATEGORY_REMOVE+CATEGORY_DRAW)
 	e2:SetType(EFFECT_TYPE_QUICK_F)
 	e2:SetCode(EVENT_CHAINING)
-	e2:SetProperty(EFFECT_FLAG_PLAYER_TARGET)
 	e2:SetRange(LOCATION_MZONE)
 	e2:SetCountLimit(1)
 	e2:SetCondition(s.condition)
@@ -88,7 +87,8 @@ function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
 	Duel.SetOperationInfo(0,CATEGORY_DRAW,nil,0,tp,1)
 end
 function s.operation(e,tp,eg,ep,ev,re,r,rp)
-	if e:GetHandler():IsRelateToEffect(e) and Duel.Release(e:GetHandler(),REASON_EFFECT)>0 then
+	local c=e:GetHandler()
+	if c:IsRelateToEffect(e) and Duel.Remove(c,POS_FACEUP,REASON_EFFECT)>0 then
 		Duel.Draw(tp,1,REASON_EFFECT)
 	end
 end

expansions/script/c89390106.lua

@@ -14,7 +14,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e2)
 	local e2=Effect.CreateEffect(c)
 	e2:SetDescription(aux.Stringid(id,0))
-	e2:SetCategory(CATEGORY_TOGRAVE+CATEGORY_SPECIAL_SUMMON)
+	e2:SetCategory(CATEGORY_REMOVE+CATEGORY_SPECIAL_SUMMON)
 	e2:SetType(EFFECT_TYPE_QUICK_F)
 	e2:SetCode(EVENT_CHAINING)
 	e2:SetRange(LOCATION_MZONE)
@@ -91,7 +91,7 @@ function s.thfilter(c,e,tp)
 end
 function s.operation(e,tp,eg,ep,ev,re,r,rp)
 	local c=e:GetHandler()
-	if c:IsRelateToEffect(e) and Duel.SendtoGrave(c,REASON_EFFECT)>0 then
+	if c:IsRelateToEffect(e) and Duel.Remove(c,POS_FACEUP,REASON_EFFECT)>0 then
 		local g=Duel.GetMatchingGroup(s.thfilter,tp,LOCATION_GRAVE,0,c,e,tp)
 		if #g>0 then
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)