clean

expansions/script/c12899019.lua

@@ -4,22 +4,23 @@ function s.initial_effect(c)
 	--Synchro summon
 	aux.AddSynchroProcedure(c,nil,aux.NonTuner(nil),1)
 	c:EnableReviveLimit()
+	if not s.global_flag then
+		s.global_flag=true
 		--act limit
 		local e1=Effect.CreateEffect(c)
-	e1:SetType(EFFECT_TYPE_SINGLE)
-	e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
+		e1:SetType(EFFECT_TYPE_FIELD)
 		e1:SetCode(EFFECT_CANNOT_TRIGGER)
-	e1:SetRange(0xff)
-	e1:SetCondition(s.actcon)
-	c:RegisterEffect(e1)
+		e1:SetTargetRange(0xff,0xff)
+		e1:SetTarget(s.disable)
+		Duel.RegisterEffect(e1,0)
 		--disable
 		local e2=Effect.CreateEffect(c)
-	e2:SetType(EFFECT_TYPE_SINGLE)
-	e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
-	e2:SetRange(LOCATION_MZONE)
+		e2:SetType(EFFECT_TYPE_FIELD)
+		e2:SetTargetRange(0xff,0xff)
+		e2:SetTarget(s.disable)
 		e2:SetCode(EFFECT_DISABLE)
-	e2:SetCondition(s.actcon)
-	c:RegisterEffect(e2)
+		Duel.RegisterEffect(e2,0)
+	end
 	--
 	local e3=Effect.CreateEffect(c)
 	e3:SetDescription(aux.Stringid(id,0))
@@ -32,7 +33,7 @@ function s.initial_effect(c)
 	--search
 	local e4=Effect.CreateEffect(c)
 	e4:SetDescription(1109)
-	e4:SetCategory(CATEGORY_TOHAND+CATEGORY_SEARCH)
+	e4:SetCategory(CATEGORY_TOHAND)
 	e4:SetType(EFFECT_TYPE_IGNITION)
 	e4:SetRange(LOCATION_GRAVE)
 	e4:SetCountLimit(1,id)
@@ -41,10 +42,17 @@ function s.initial_effect(c)
 	e4:SetOperation(s.thop)
 	c:RegisterEffect(e4)
 end
+s.limt_name_hpk=id
 function s.actcon(e)
 	local tp=e:GetHandlerPlayer()
 	return Duel.IsExistingMatchingCard(s.ndcfilter,tp,LOCATION_MZONE,0,1,nil)
 end
+function s.disable(e,c)
+	if c.limt_name_hpk~=id then return end
+	local tp=c:GetControler()
+	return (c:IsType(TYPE_EFFECT) or c:GetOriginalType()&TYPE_EFFECT~=0)
+		and Duel.IsExistingMatchingCard(s.ndcfilter,tp,LOCATION_MZONE,0,1,nil)
+end
 function s.ndcfilter(c)
 	return c:IsFacedown() or not c:IsSetCard(0x5a71)
 end
@@ -83,15 +91,15 @@ end
 function s.thfilter(c)
 	local b1=c:IsAbleToHand() 
 	local b2=c:IsType(TYPE_SPELL+TYPE_TRAP) and c:IsSSetable()
-	return c:IsSetCard(0x6a71) and (b1 or b2)
+	return c:IsFaceupEx() and c:IsSetCard(0x6a71) and (b1 or b2)
 end
 function s.thtg(e,tp,eg,ep,ev,re,r,rp,chk)
-	if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_DECK,0,1,nil) end
-	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_DECK)
+	if chk==0 then return Duel.IsExistingMatchingCard(s.thfilter,tp,LOCATION_REMOVED,0,1,nil) end
+	Duel.SetOperationInfo(0,CATEGORY_TOHAND,nil,1,tp,LOCATION_REMOVED)
 end
 function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	Duel.Hint(HINT_SELECTMSG,tp,HINTMSG_ATOHAND)
-	local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_DECK,0,1,1,nil)
+	local g=Duel.SelectMatchingCard(tp,s.thfilter,tp,LOCATION_REMOVED,0,1,1,nil)
 	local tc=g:GetFirst()
 	local b1=tc:IsAbleToHand() 
 	local b2=tc:IsType(TYPE_SPELL+TYPE_TRAP) and tc:IsSSetable()

expansions/strings.conf

@@ -535,7 +535,7 @@
 !setname 0x3991 Alice Margatroid
 !counter 0x1990 七色人形剧指示物
 
-#胆小的兔子 2490482695 199 0x???-0x???
+#胆小的兔子 2490482695 199
 
 #小壶 1701585682 200 0xfd0-0xfdf
 !setname 0x3fd0 无亘