Fix 糾罪巧-Aizaβ.LEON

script/c100245018.lua

@@ -157,12 +157,14 @@ function s.disop(e,tp,eg,ep,ev,re,r,rp)
 		local e1=Effect.CreateEffect(e:GetHandler())
 		e1:SetType(EFFECT_TYPE_SINGLE)
 		e1:SetCode(EFFECT_DISABLE)
+		e1:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 		e1:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 		tc:RegisterEffect(e1)
 		local e2=Effect.CreateEffect(e:GetHandler())
 		e2:SetType(EFFECT_TYPE_SINGLE)
 		e2:SetCode(EFFECT_DISABLE_EFFECT)
 		e2:SetValue(RESET_TURN_SET)
+		e2:SetProperty(EFFECT_FLAG_CANNOT_DISABLE)
 		e2:SetReset(RESET_EVENT+RESETS_STANDARD+RESET_PHASE+PHASE_END)
 		tc:RegisterEffect(e2)
 	end

script/c100245020.lua

@@ -64,19 +64,19 @@ function s.initial_effect(c)
 	e5:SetOperation(s.damop1)
 	c:RegisterEffect(e5)
 	local e6=Effect.CreateEffect(c)
-	e6:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
+	e6:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e6:SetCode(EVENT_TO_HAND)
-	e6:SetRange(LOCATION_MZONE)
+	e6:SetLabelObject(c)
 	e6:SetCondition(s.regcon)
 	e6:SetOperation(s.regop)
-	c:RegisterEffect(e6)
+	Duel.RegisterEffect(e6,0)
 	local e7=Effect.CreateEffect(c)
-	e7:SetType(EFFECT_TYPE_CONTINUOUS+EFFECT_TYPE_FIELD)
+	e7:SetType(EFFECT_TYPE_FIELD+EFFECT_TYPE_CONTINUOUS)
 	e7:SetCode(EVENT_CHAIN_SOLVED)
-	e7:SetRange(LOCATION_MZONE)
+	e7:SetLabelObject(c)
 	e7:SetCondition(s.damcon2)
 	e7:SetOperation(s.damop2)
-	c:RegisterEffect(e7)
+	Duel.RegisterEffect(e7,0)
 	Duel.AddCustomActivityCounter(id,ACTIVITY_SPSUMMON,s.counterfilter)
 end
 function s.counterfilter(c)
@@ -164,7 +164,7 @@ function s.thop(e,tp,eg,ep,ev,re,r,rp)
 	end
 end
 function s.flipop(e,tp,eg,ep,ev,re,r,rp)
-	e:GetHandler():RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD,0,1)
+	e:GetHandler():RegisterFlagEffect(id,RESET_EVENT+RESETS_STANDARD,EFFECT_FLAG_CLIENT_HINT,1,0,aux.Stringid(id,3))
 end
 function s.damcon1(e,tp,eg,ep,ev,re,r,rp)
 	return e:GetHandler():GetFlagEffect(id)>0
@@ -176,23 +176,34 @@ function s.damop1(e,tp,eg,ep,ev,re,r,rp)
 	local ct=eg:FilterCount(Card.IsControler,nil,1-tp)
 	Duel.Damage(1-tp,ct*900,REASON_EFFECT)
 end
+function s.regfilter(c,ec,code)
+	return c==ec and c:IsFaceup() and c:GetFlagEffect(code)>0 and not c:IsStatus(STATUS_BATTLE_DESTROYED) and not c:IsDisabled()
+end
 function s.regcon(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetFlagEffect(id)>0
-		and eg:IsExists(Card.IsControler,1,nil,1-tp) and Duel.IsChainSolving()
-		and re and re:GetOwnerPlayer()==1-tp
+	local c=e:GetLabelObject()
+	local p=c:GetControler()
+	return eg:IsExists(Card.IsControler,1,nil,1-p) and Duel.IsChainSolving()
+		and re and re:GetOwnerPlayer()==1-p
+		and Duel.IsExistingMatchingCard(s.regfilter,p,LOCATION_MZONE,0,1,nil,c,id)
 end
 function s.regop(e,tp,eg,ep,ev,re,r,rp)
-	local ct=eg:FilterCount(Card.IsControler,nil,1-tp)
-	e:GetHandler():RegisterFlagEffect(id+o,RESET_EVENT+RESETS_STANDARD+RESET_CHAIN,0,1,ct)
+	local c=e:GetLabelObject()
+	local p=c:GetControler()
+	local ct=eg:FilterCount(Card.IsControler,nil,1-p)
+	c:RegisterFlagEffect(id+o,RESET_EVENT+RESETS_STANDARD+RESET_CHAIN,0,1,ct)
 end
 function s.damcon2(e,tp,eg,ep,ev,re,r,rp)
-	return e:GetHandler():GetFlagEffect(id+o)>0
+	local c=e:GetLabelObject()
+	local p=c:GetControler()
+	return Duel.IsExistingMatchingCard(s.regfilter,p,LOCATION_MZONE,0,1,nil,c,id+o)
 end
 function s.damop2(e,tp,eg,ep,ev,re,r,rp)
+	local c=e:GetLabelObject()
+	local p=c:GetControler()
 	Duel.Hint(HINT_CARD,0,id)
-	local labels={e:GetHandler():GetFlagEffectLabel(id+o)}
+	local labels={c:GetFlagEffectLabel(id+o)}
 	local ct=0
 	for i=1,#labels do ct=ct+labels[i] end
-	e:GetHandler():ResetFlagEffect(id+o)
-	Duel.Damage(1-tp,ct*900,REASON_EFFECT)
+	c:ResetFlagEffect(id+o)
+	Duel.Damage(1-p,ct*900,REASON_EFFECT)
 end

test-strings.conf

 #The first line is used for comment
 !counter 0x106f 少女指示物
+!counter 0x70 龋齿指示物
+!counter 0x71 盘子指示物
 !counter 0x73 纠罪指示物
 !setname 0x2cf 树熊
 !setname 0x2d0 死伟王
@@ -7,7 +9,4 @@
 !setname 0x2d2 奏悦机组
 !setname 0x2d3 终刻
 !setname 0x2d4 不可见
-!counter 0x70 龋齿指示物
-!counter 0x71 盘子指示物
-!setname 0x2d5 纠罪巧
-!counter 0x73 纠罪指示物
\ No newline at end of file
+!setname 0x2d5 纠罪巧
\ No newline at end of file