fix

expansions/lflist.conf

@@ -7094,6 +7094,7 @@
 17339080 0
 60001311 0
 12882040 0
+17339130 0
 #limit
 33403513 1
 82204250 0

expansions/script/c12899010.lua

@@ -90,7 +90,7 @@ function cm.eqop(e,tp,eg,ep,ev,re,r,rp)
 		tc:RegisterFlagEffect(m,RESET_EVENT+RESETS_STANDARD,0,0)
 		local e1=Effect.CreateEffect(c)
 		e1:SetType(EFFECT_TYPE_SINGLE)
-		e1:SetProperty(EFFECT_FLAG_COPY_INHERIT+EFFECT_FLAG_OWNER_RELATE)
+		e1:SetProperty(EFFECT_FLAG_OWNER_RELATE)
 		e1:SetCode(EFFECT_EQUIP_LIMIT)
 		e1:SetReset(RESET_EVENT+RESETS_STANDARD)
 		e1:SetValue(cm.eqlimit)

expansions/script/c40020357.lua

@@ -2,7 +2,7 @@
 local s,id=GetID()
 s.ui_hint_effect = s.ui_hint_effect or {}
 local CORE_ID = 40020353 
-local ArmedIntervention = CORE_ID	
+local ArmedIntervention = CORE_ID   
 local ArmedIntervention_UI = CORE_ID + 10000
 --CB
 s.named_with_CelestialBeing=1
@@ -155,7 +155,7 @@ function s.lvop(e,tp,eg,ep,ev,re,r,rp)
 				 e1:SetType(EFFECT_TYPE_SINGLE)
 				 e1:SetCode(EFFECT_UPDATE_LEVEL)
 				 e1:SetValue(3)
-				 e1:SetReset(RESET_EVENT+RESETS_STANDARD_DISABLE)
+				 e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_DISABLE)
 				 c:RegisterEffect(e1)
 				 
 				 local current_lv = c:GetLevel()

expansions/script/c40020380.lua

@@ -45,8 +45,7 @@ function s.initial_effect(c)
 	c:RegisterEffect(e3)	
 end
 function s.spcfilter(c,e,tp)
-	return s.CelestialBeing(c) and c:IsAttribute(ATTRIBUTE_WATER) and c:IsType(TYPE_UNION)
-		and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
+	return s.CelestialBeing(c) and c:IsAttribute(ATTRIBUTE_WATER) and c:IsType(TYPE_UNION) and c:IsCanBeSpecialSummoned(e,0,tp,false,false)
 end
 
 
@@ -129,7 +128,7 @@ function s.actop(e,tp,eg,ep,ev,re,r,rp)
 
 	if Duel.MoveToField(c,tp,tp,LOCATION_SZONE,POS_FACEUP,true) then
 
-		local g=Duel.GetMatchingGroup(s.spcfilter,tp,LOCATION_DECK,0,nil)
+		local g=Duel.GetMatchingGroup(s.spcfilter,tp,LOCATION_DECK,0,nil,e,tp)
 		if g:GetCount()>0 and Duel.GetLocationCount(tp,LOCATION_MZONE)>0 
 	   and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_SPSUMMON)

expansions/script/c40020470.lua

@@ -65,7 +65,7 @@ function s.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 
 function s.thfilter(c)
-	return s.Exia(c) and c:IsType(TYPE_MONSTER) and not c:GetCode(id) and c:IsAbleToHand()
+	return s.Exia(c) and c:IsType(TYPE_MONSTER) and not c:IsCode(id) and c:IsAbleToHand()
 end
 
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c40020477.lua

@@ -58,7 +58,7 @@ function s.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 
 function s.thfilter(c)
-	return s.Kyrios(c) and c:IsType(TYPE_MONSTER) and not c:GetCode(id)  and c:IsAbleToHand()
+	return s.Kyrios(c) and c:IsType(TYPE_MONSTER) and not c:IsCode(id)  and c:IsAbleToHand()
 end
 
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c40020482.lua

@@ -57,7 +57,7 @@ function s.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 
 function s.thfilter(c)
-	return s.Dynames(c) and c:IsType(TYPE_MONSTER) and not c:GetCode(id)  and c:IsAbleToHand()
+	return s.Dynames(c) and c:IsType(TYPE_MONSTER) and not c:IsCode(id)  and c:IsAbleToHand()
 end
 
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c40020487.lua

@@ -58,7 +58,7 @@ function s.thcost(e,tp,eg,ep,ev,re,r,rp,chk)
 end
 
 function s.thfilter(c)
-	return s.Virtue(c) and c:IsType(TYPE_MONSTER) and not c:GetCode(id)  and c:IsAbleToHand()
+	return s.Virtue(c) and c:IsType(TYPE_MONSTER) and not c:IsCode(id)  and c:IsAbleToHand()
 end
 
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)

expansions/script/c40020497.lua

@@ -7,13 +7,12 @@ function s.CelestialBeing(c)
 	return m and m.named_with_CelestialBeing
 end
 function s.initial_effect(c)
-	e1:SetDescription(aux.Stringid(id,0))
 	local e1=Effect.CreateEffect(c)
+	e1:SetDescription(aux.Stringid(id,0))
 	e1:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH+CATEGORY_DECKDES)
 	e1:SetType(EFFECT_TYPE_ACTIVATE)
 	e1:SetCode(EVENT_FREE_CHAIN)
 	e1:SetCountLimit(1,id,EFFECT_COUNT_CODE_OATH)
-	e1:SetTarget(s.target)
 	e1:SetOperation(s.activate)
 	c:RegisterEffect(e1)
 
@@ -28,15 +27,11 @@ function s.initial_effect(c)
 	c:RegisterEffect(e2)
 end
 
-function s.target(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.GetFieldGroupCount(tp,LOCATION_DECK,0)>=3 end
-	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,0,LOCATION_DECK)
-	Duel.SetOperationInfo(0,CATEGORY_DECKDES,nil,0,tp,3)
-end
+
 
 function s.thfilter(c)
 
-	return s.CelestialBeing(c) and not c:GetCode(id) and c:IsAbleToHand()
+	return s.CelestialBeing(c) and not c:IsCode(id) and c:IsAbleToHand()
 end
 
 function s.activate(e,tp,eg,ep,ev,re,r,rp)
@@ -45,14 +40,15 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	
 	Duel.ConfirmDecktop(tp,3)
 	local g=Duel.GetDecktopGroup(tp,3)
-	if #g>0 then
+	if #g>0 and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
 		Duel.DisableShuffleCheck()
 
-		if g:IsExists(s.thfilter,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,0)) then
+		if g:IsExists(s.thfilter,1,nil) and Duel.SelectYesNo(tp,aux.Stringid(id,1))  then
 			Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
 			local sg=g:FilterSelect(tp,s.thfilter,1,1,nil)
 			Duel.SendtoHand(sg,nil,REASON_EFFECT)
 			Duel.ConfirmCards(1-tp,sg)
+			Duel.ShuffleHand(tp)
 			g:Sub(sg)
 		end
 
@@ -60,7 +56,6 @@ function s.activate(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 
--- ②
 function s.imtg(e,c)
 
 	return s.CelestialBeing(c) and c:IsRace(RACE_MACHINE) and bit.band(c:GetType(),TYPE_RITUAL)~=0

expansions/script/c7427510.lua

@@ -36,7 +36,7 @@ function s.initial_effect(c)
 	end
 end
 function s.costfilter(c,e,tp)
-	return c:IsSetCard(0xdce) and c:IsType(TYPE_MONSTER) and not c:IsPublic()
+	return c:IsSetCard(0xdce) and not c:IsPublic()
 end
 function s.cost(e,tp,eg,ep,ev,re,r,rp,chk)
 	local c=e:GetHandler()

expansions/script/c7427524.lua

@@ -14,10 +14,11 @@ function s.initial_effect(c)
 	c:RegisterEffect(e0)
 	--todeck
 	local e3=Effect.CreateEffect(c)
-	e3:SetDescription(aux.Stringid(52068432,1))
-	e3:SetCategory(CATEGORY_REMOVE)
+	e3:SetDescription(aux.Stringid(id,0))
+	e3:SetCategory(CATEGORY_TODECK)
 	e3:SetType(EFFECT_TYPE_SINGLE+EFFECT_TYPE_TRIGGER_O)
 	e3:SetCode(EVENT_SPSUMMON_SUCCESS)
+	e3:SetProperty(EFFECT_FLAG_DELAY)
 	e3:SetCondition(s.tdcon)
 	e3:SetTarget(s.tdtg)
 	e3:SetOperation(s.tdop)