diff --git a/build/10-装备最大孔数提示.txt b/build/10-装备最大孔数提示.txt
index 7d8cf0c..9b60010 100644
--- a/build/10-装备最大孔数提示.txt
+++ b/build/10-装备最大孔数提示.txt
@@ -1,31 +1,33 @@
 //                                            ++++++  3.3，非底材装备可能孔数提示 ++++++
 //任务打孔
-ItemDisplay[ITEM_TAG3 (dgr OR dir OR wnd OR ywn OR 9wn OR tkf OR jav OR (ci0 ILVL<26) OR aqv OR cqv) MAG ID SOCK=0]:%NAME%{%NAME%%CL%%WHITE%可能的孔数: %TAN%[%WHITE%任务:1}%CONTINUE%
-ItemDisplay[ITEM_TAG3 ((CHEST OR HELM OR CIRC OR SHIELD) OR WEAPON OR QUIVER) !(dgr OR dir OR wnd OR ywn OR 9wn OR tkf OR jav OR (ci0 ILVL<26) OR aqv OR cqv) MAG ID SOCK=0]:%NAME%{%NAME%%CL%%WHITE%可能的孔数: %TAN%[%WHITE%任务:2}%CONTINUE%
-ItemDisplay[ITEM_TAG3 (CHEST OR HELM OR CIRC OR SHIELD OR WEAPON OR QUIVER) (RARE OR CRAFT OR UNI OR SET) ID SOCK=0]:%NAME%{%NAME%%CL%%WHITE%可能的孔数: %TAN%[%WHITE%任务:1}%CONTINUE%
+ItemDisplay[ITEM_TAG3 (dgr OR dir OR wnd OR ywn OR 9wn OR tkf OR jav OR (ci0 ILVL<26) OR aqv OR cqv) MAG ID SOCK=0 !EQUIPPED !MERC]:%NAME%{%NAME%%CL%%WHITE%可能的孔数: %TAN%[%WHITE%任务:1}%CONTINUE%
+ItemDisplay[ITEM_TAG3 ((CHEST OR HELM OR CIRC OR SHIELD) OR WEAPON OR QUIVER) !(dgr OR dir OR wnd OR ywn OR 9wn OR tkf OR jav OR (ci0 ILVL<26) OR aqv OR cqv) MAG ID SOCK=0 !EQUIPPED !MERC]:%NAME%{%NAME%%CL%%WHITE%可能的孔数: %TAN%[%WHITE%任务:2}%CONTINUE%
+ItemDisplay[ITEM_TAG3 (CHEST OR HELM OR CIRC OR SHIELD OR WEAPON OR QUIVER) (RARE OR CRAFT OR UNI OR SET) ID SOCK=0 !EQUIPPED !MERC]:%NAME%{%NAME%%CL%%WHITE%可能的孔数: %TAN%[%WHITE%任务:1}%CONTINUE%
 //谜盒打孔
 //箭矢
-ItemDisplay[ITEM_TAG3 QUIVER (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0]:%NAME%{%NAME%, %TAN%谜盒%WHITE%:1-%MAXSOCKETS%}%CONTINUE%
+ItemDisplay[ITEM_TAG3 QUIVER (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 !EQUIPPED !MERC]:%NAME%{%NAME%, %TAN%谜盒%WHITE%:1-%MAXSOCKETS%}%CONTINUE%
 //防具
-ItemDisplay[ITEM_TAG3 (HELM OR CHEST OR SHIELD OR CIRC) (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0]:%NAME%{%NAME%, %TAN%谜盒%WHITE%:1~2}%CONTINUE%
+ItemDisplay[ITEM_TAG3 (HELM OR CHEST OR SHIELD OR CIRC) MAXSOCKETS<2 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 !EQUIPPED !MERC]:%NAME%{%NAME%, %TAN%谜盒%WHITE%:1~%MAXSOCKETS%}%CONTINUE%
+ItemDisplay[ITEM_TAG3 (HELM OR CHEST OR SHIELD OR CIRC) MAXSOCKETS>1 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 !EQUIPPED !MERC]:%NAME%{%NAME%, %TAN%谜盒%WHITE%:1~2}%CONTINUE%
 //武器
-ItemDisplay[ITEM_TAG3 WEAPON 1H MAXSOCKETS<5 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0]:%NAME%{%NAME%, %TAN%谜盒%WHITE%:1-2}%CONTINUE%
-ItemDisplay[ITEM_TAG3 WEAPON 1H MAXSOCKETS>4 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0]:%NAME%{%NAME%, %TAN%谜盒%WHITE%:1-2}%CONTINUE%
-ItemDisplay[ITEM_TAG3 WEAPON 2H MAXSOCKETS<5 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0]:%NAME%{%NAME%, %TAN%谜盒%WHITE%:2-%MAXSOCKETS%}%CONTINUE%
-ItemDisplay[ITEM_TAG3 WEAPON 2H MAXSOCKETS>4 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0]:%NAME%{%NAME%, %TAN%谜盒%WHITE%:2-4}%CONTINUE%
+//武器
+ItemDisplay[ITEM_TAG3 WEAPON 1H MAXSOCKETS<2 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 !EQUIPPED !MERC]:%NAME%{%NAME%, %TAN%谜盒%WHITE%:1-%MAXSOCKETS%}%CONTINUE%
+ItemDisplay[ITEM_TAG3 WEAPON 1H MAXSOCKETS>1 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 !EQUIPPED !MERC]:%NAME%{%NAME%, %TAN%谜盒%WHITE%:1-2}%CONTINUE%
+ItemDisplay[ITEM_TAG3 WEAPON 2H MAXSOCKETS<5 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 !EQUIPPED !MERC]:%NAME%{%NAME%, %TAN%谜盒%WHITE%:2-%MAXSOCKETS%}%CONTINUE%
+ItemDisplay[ITEM_TAG3 WEAPON 2H MAXSOCKETS>4 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 !EQUIPPED !MERC]:%NAME%{%NAME%, %TAN%谜盒%WHITE%:2-4}%CONTINUE%
 //腐化打孔
 //箭矢
-ItemDisplay[ITEM_TAG3 QUIVER (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 STAT360=0]:%NAME%{%NAME%, %RED%腐化%WHITE%:1-%MAXSOCKETS%}%CONTINUE%
+ItemDisplay[ITEM_TAG3 QUIVER (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 STAT360=0 !EQUIPPED !MERC]:%NAME%{%NAME%, %RED%腐化%WHITE%:1-%MAXSOCKETS%}%CONTINUE%
 //防具
-ItemDisplay[ITEM_TAG3 (HELM OR CHEST OR SHIELD OR CIRC) MAXSOCKETS<4 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 STAT360=0]:%NAME%{%NAME%, %RED%腐化%WHITE%:1-%MAXSOCKETS%}%CONTINUE%
-ItemDisplay[ITEM_TAG3 (HELM OR CHEST OR SHIELD OR CIRC) MAXSOCKETS>3 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 STAT360=0]:%NAME%{%NAME%, %RED%腐化%WHITE%:1-3}%CONTINUE%
+ItemDisplay[ITEM_TAG3 (HELM OR CHEST OR SHIELD OR CIRC) MAXSOCKETS<4 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 STAT360=0 !EQUIPPED !MERC]:%NAME%{%NAME%, %RED%腐化%WHITE%:1-%MAXSOCKETS%}%CONTINUE%
+ItemDisplay[ITEM_TAG3 (HELM OR CHEST OR SHIELD OR CIRC) MAXSOCKETS>3 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 STAT360=0 !EQUIPPED !MERC]:%NAME%{%NAME%, %RED%腐化%WHITE%:1-3}%CONTINUE%
 //武器
-ItemDisplay[ITEM_TAG3 WEAPON 1H MAXSOCKETS<2 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 STAT360=0]:%NAME%{%NAME%, %RED%腐化%WHITE%:1-%MAXSOCKETS%}%CONTINUE%
-ItemDisplay[ITEM_TAG3 WEAPON 1H MAXSOCKETS>1 MAXSOCKETS<5 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 STAT360=0]:%NAME%{%NAME%, %RED%腐化%WHITE%:2-%MAXSOCKETS%}%CONTINUE%
-ItemDisplay[ITEM_TAG3 WEAPON 1H MAXSOCKETS>4 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 STAT360=0]:%NAME%{%NAME%, %RED%腐化%WHITE%:2-4}%CONTINUE%
-ItemDisplay[ITEM_TAG3 WEAPON 2H (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 STAT360=0]:%NAME%{%NAME%, %RED%腐化%WHITE%:3-%MAXSOCKETS%}%CONTINUE%
+ItemDisplay[ITEM_TAG3 WEAPON 1H MAXSOCKETS<2 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 STAT360=0 !EQUIPPED !MERC]:%NAME%{%NAME%, %RED%腐化%WHITE%:1-%MAXSOCKETS%}%CONTINUE%
+ItemDisplay[ITEM_TAG3 WEAPON 1H MAXSOCKETS>1 MAXSOCKETS<5 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 STAT360=0 !EQUIPPED !MERC]:%NAME%{%NAME%, %RED%腐化%WHITE%:2-%MAXSOCKETS%}%CONTINUE%
+ItemDisplay[ITEM_TAG3 WEAPON 1H MAXSOCKETS>4 (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 STAT360=0 !EQUIPPED !MERC]:%NAME%{%NAME%, %RED%腐化%WHITE%:2-4}%CONTINUE%
+ItemDisplay[ITEM_TAG3 WEAPON 2H (RARE OR CRAFT OR UNI OR SET OR MAG) SOCK=0 STAT360=0 !EQUIPPED !MERC]:%NAME%{%NAME%, %RED%腐化%WHITE%:3-%MAXSOCKETS%}%CONTINUE%
 //closer
-ItemDisplay[ITEM_TAG3 ((CHEST OR HELM OR CIRC OR SHIELD) OR WEAPON OR QUIVER) (RARE OR CRAFT OR UNI OR SET OR MAG) ID SOCK=0]:%NAME%{%NAME%%TAN%]}%CONTINUE%
+ItemDisplay[ITEM_TAG3 ((CHEST OR HELM OR CIRC OR SHIELD) OR WEAPON OR QUIVER) (RARE OR CRAFT OR UNI OR SET OR MAG) ID SOCK=0 !EQUIPPED !MERC]:%NAME%{%NAME%%TAN%]}%CONTINUE%
 
 // 自带孔数的装备变量显示
 ItemDisplay[ITEM_TAG3 SET ID urn STAT234>0]:%NAME%{%NAME%%CL%%WHITE%原生孔数: 2-3}%CONTINUE%