diff --git a/ViLoot.txt b/ViLoot.txt
index 1a608fa..0ba0b0b 100644
--- a/ViLoot.txt
+++ b/ViLoot.txt
@@ -129,14 +129,14 @@ Formula[DRUSK]: (SK221+SK222+SK223+SK224+SK225+SK226+SK227+SK228+SK229+SK230+SK2
 //
 Alias[GOODSTAFF]: (SK48>2 OR SK61>2 OR SK63>2 OR SK65>2 OR (SK69>2 SK70>2) OR (SK79>2 SK94>2) OR SK99>2 OR (SK221>2 SK247>2) OR (SK252>2 SK280>2) OR (SK252>2 (SK263>2 OR SK275>2)))
 //
-//大院长 女族长
-Alias[AMACRAFT]: ((amc OR amb) (MAG OR RARE) !ID)
+//大院长am2 am7 amc 女族长am1 am6 amb
+Alias[AMACRAFT]: (am7 OR amc)
 //投掷武器底材
-Alias[BARCRAFT]: ((glv OR 9gl OR 7gl OR bal OR 9b8 OR 7b8) (MAG OR RARE) ETH !ID)
+Alias[BARCRAFT]: ((glv OR 9gl OR 7gl OR tsp OR 9ts OR 7ts) ETH)
 //刺客爪子底材
-Alias[ASNCRAFT]: ((axf OR btl OR 9xf OR 9tw OR 7xf OR 7tw) (MAG OR RARE) ETH !ID)
+Alias[ASNCRAFT]: (axf OR btl OR 9xf OR 9tw OR 7xf OR 7tw)
 //盔甲底材
-Alias[AMOCRAFT]: ((uui OR uea OR ula OR utu OR urs OR utp)  (MAG OR RARE) !ID)
+Alias[AMOCRAFT]: (uui OR uea OR ula OR utu OR urs OR utp)
 //有用的非精英暗金
 Alias[GOODUNI]: 
 //NOTICE ME, THAT's ME
@@ -2208,9 +2208,9 @@ ItemDisplay[drc UNI]: %NAME%{%TIPLTS%  %RED%Su%ORANGE%pe%YELLOW%r %GOLD%S%GREEN%
 // +----------------------------------------------------------------------------+
 //
 //sk, 20ias Gloves
-ItemDisplay[SIGLOVE]: %NAME%{%TIPLTS%    %RED%$f(TABSK0+TABSK1+TABSK2+TABSK32+TABSK41+TABSK50)%ORANGE%SK %YELLOW%20%GREEN%IAS %BLUE%Gl%PURPLE%ov%WHITE%es    %TIPLTS%%CL%%NAME%}
-ItemDisplay[tgl UNI STAT363>0 FCR>20]: %NAME%{%TIPLTS%    %RED%Ha%ORANGE%pp%YELLOW%y %PURPLE%E%WHITE%n%GREEN%d    %TIPLTS%%CL%%NAME%}
-ItemDisplay[utg UNI STAT363>0 STAT77>30 FCR>20]: %NAME%{%TIPLTS%    %RED%Ha%ORANGE%pp%YELLOW%y %PURPLE%E%WHITE%n%GREEN%d    %TIPLTS%%CL%%NAME%}
+ItemDisplay[SIGLOVE]: %NAME%{%TIPLTS%    %RED%$f(TABSK0+TABSK1+TABSK2+TABSK32+TABSK41+TABSK50)%ORANGE%SK %YELLOW%20%GREEN%IAS %BLUE%Gl%PURPLE%ov%WHITE%es    %TIPRTS%%CL%%NAME%}
+ItemDisplay[tgl UNI STAT363>0 FCR>20]: %NAME%{%TIPLTS%    %RED%Ha%ORANGE%pp%YELLOW%y %PURPLE%E%WHITE%n%GREEN%d    %TIPRTS%%CL%%NAME%}
+ItemDisplay[utg UNI STAT363>0 STAT77>30 FCR>20]: %NAME%{%TIPLTS%    %RED%Ha%ORANGE%pp%YELLOW%y %PURPLE%E%WHITE%n%GREEN%d    %TIPRTS%%CL%%NAME%}
 ItemDisplay[GLOVE MAG (TABSK0=3 OR TABSK1=3 OR TABSK2=3 OR TABSK32=3 OR TABSK41=3 OR TABSK50=3) SHOP]: %NAME%{%TIPLTS%      %RED%高%ORANGE%技%WHITE%能%PURPLE%等%YELLOW%级      %TIPRTS%%CL%%NAME%}
 //
 // +----------------------------------------------------------------------------+
@@ -3670,7 +3670,7 @@ ItemDisplay[RARE !ID CHEST GOODCHEST (PREFIX=325 OR PREFIX=330 OR PREFIX=64)]: %
 ItemDisplay[RARE !ID CHEST GOODCHEST (PREFIX=324 OR PREFIX=329 OR PREFIX=334)]: %WHITE%11%TAN%全抗 %NAME%%CONTINUE%
 ItemDisplay[RARE !ID CHEST GOODCHEST SUFFIX=798]: %WHITE%10%%ORANGE%物免 %NAME%%CONTINUE%
 ItemDisplay[RARE !ID CHEST GOODCHEST SUFFIX=1029]: %WHITE%15%%ORANGE%物免 %NAME%%CONTINUE%
-ItemDisplay[RARE !ID CHEST GOODCHEST SUFFIX=799]: %WHITE%20%%%ORANGE%物免 %NAME%%CONTINUE%
+ItemDisplay[RARE !ID CHEST GOODCHEST SUFFIX=799]: %WHITE%20%%ORANGE%物免 %NAME%%CONTINUE%
 ItemDisplay[RARE !ID CHEST GOODCHEST SUFFIX=800]: %WHITE%25%%ORANGE%物免 %NAME%%CONTINUE%
 ItemDisplay[RARE !ID CHEST GOODCHEST SUFFIX=263]: %WHITE%17%GOLD%FHR %NAME%%CONTINUE%
 ItemDisplay[RARE !ID CHEST GOODCHEST SUFFIX=264]: %WHITE%24%GOLD%FHR %NAME%%CONTINUE%
@@ -3930,10 +3930,10 @@ ItemDisplay[(MAG OR RARE) rin CRAFTALVL>80 !ID FILTLVL=5]: %NAME% %ORANGE%[C]
 // +----------------------------------------------------------------------------+
 //
 //弓、爪、投掷
-ItemDisplay[AMACRAFT ((AMAZON FILTLVL<5) OR FILTLVL=5)]: %BORDER-A8%%DOT-60%%TIER-0%%NAME% %GRAY%[%ORANGE%C%GRAY%]{%NAME%}
-ItemDisplay[BARCRAFT ((AMAZON FILTLVL<5) OR (BARBARIAN FILTLVL<5) OR FILTLVL=5)]: %BORDER-A8%%DOT-60%%TIER-0%%NAME% %GRAY%[%ORANGE%C%GRAY%]{%NAME%}
-ItemDisplay[ASNCRAFT ((ASSASSIN FILTLVL<5) OR FILTLVL=5)]: %BORDER-A8%%DOT-60%%TIER-0%%NAME% %GRAY%[%ORANGE%C%GRAY%]{%NAME%}
-ItemDisplay[AMOCRAFT FILTLVL=5]: %BORDER-A8%%DOT-60%%TIER-0%%NAME% %GRAY%[%ORANGE%C%GRAY%]{%NAME%}
+ItemDisplay[AMACRAFT (MAG OR RARE) !ID ((AMAZON FILTLVL<5) OR FILTLVL=5)]: %BORDER-A8%%DOT-60%%TIER-0%%NAME% %GRAY%[%ORANGE%C%GRAY%]{%NAME%}
+ItemDisplay[BARCRAFT (MAG OR RARE) !ID]: %BORDER-A8%%DOT-60%%TIER-0%%NAME% %GRAY%[%ORANGE%C%GRAY%]{%NAME%}
+ItemDisplay[ASNCRAFT (MAG OR RARE) !ID ((ASSASSIN FILTLVL<5) OR FILTLVL=5)]: %BORDER-A8%%DOT-60%%TIER-0%%NAME% %GRAY%[%ORANGE%C%GRAY%]{%NAME%}
+ItemDisplay[AMOCRAFT (MAG OR RARE) !ID FILTLVL=5]: %BORDER-A8%%DOT-60%%TIER-0%%NAME% %GRAY%[%ORANGE%C%GRAY%]{%NAME%}
 ItemDisplay[(MAG OR RARE) WEAPON CRAFTALVL>76 FILTLVL=5]: %NAME% %ORANGE%[C]{%NAME%%CL%%CL%%GRAY%吸血鬼:%TAN% P %GRAY%骷髅 + %WHITE%Shael 13#%NL%%GREEN%安全:%TAN% P %GREEN%绿宝石 + %WHITE%Sol 12#%NL%%BLUE%打击:%TAN% P %BLUE%蓝宝石 + %WHITE%Tir%NL%%PURPLE%施法者:%TAN% P %RED%红宝石 + %WHITE%Tir%NL%%WHITE%闪耀:%TAN% P Dia + Sol 12#%NL%%YELLOW%丰饶:%TAN% P %YELLOW%黄宝石 + %WHITE%Shael 13#%NL%%RED%生命:%TAN% P %RED%红宝石 + %WHITE%Ort 9#%NL%%ORANGE%手工公式:}
 ItemDisplay[(MAG OR RARE) !ID (ETH OR CLASS) WEAPON CRAFTALVL>76 FILTLVL=5]: %NAME% %ORANGE%[C]
 ItemDisplay[(MAG OR RARE) ID WEAPON CRAFTALVL>76 !ID FILTLVL=5]: %NAME% %ORANGE%[C]
@@ -5269,20 +5269,20 @@ ItemDisplay[ci2 NMAG SOCK=0 !ETH CLVL>72 (FILTLVL<4 OR FILTLVL=5)]: %NAME% %GRAY
 ItemDisplay[ci3 NMAG SOCK=0 !ETH (FILTLVL<4 OR FILTLVL=5)]: %NAME% %GRAY%[%GOLD%注%GRAY%]{%CL%%TAN%提示%WHITE%:%WHITE%可在ACT1的恰西处 %YELLOW%注入%CL%%NAME%}
 //
 //AMA弓、标枪类(无形)
-ItemDisplay[(am7 OR amc OR amb) NMAG SOCK=0 ((AMAZON FILTLVL<5) OR FILTLVL=5)]:  %DOT-A8%%TIER-0%%NAME% %GRAY%[%GOLD%注%GRAY%]{%WHITE%接着: 就可以把它做为 %ORANGE%手工 %WHITE%的底材%CL%%TAN%提示%WHITE%: 你可以在A1 恰西处 %YELLOW%注入 %WHITE%属性%CL%%NAME%}
-ItemDisplay[(8hx OR 6hx OR 8mx OR 6mx) NMAG SOCK=0 ((AMAZON FILTLVL<3) OR FILTLVL=5)]:  %DOT-A8%%TIER-0%%NAME% %GRAY%[%GOLD%注%GRAY%]{%WHITE%接着: 就可以把它做为 %ORANGE%手工 %WHITE%的底材%CL%%TAN%提示%WHITE%: 你可以在A1 恰西处 %YELLOW%注入 %WHITE%属性%CL%%NAME%}
-ItemDisplay[(ama OR amf) AMAZON FILTLVL=5 ETH NMAG SOCK=0]:  %NAME%%GRAY%[%GOLD%注%GRAY%]{%WHITE%接着: 就可以把它做为 %ORANGE%手工 %WHITE%的底材%CL%%TAN%提示%WHITE%: 你可以在A1 恰西处 %YELLOW%注入 %WHITE%属性%CL%%NAME%}
+ItemDisplay[AMACRAFT NMAG SOCK=0 ((AMAZON FILTLVL<5) OR FILTLVL=5)]:  %DOT-A8%%TIER-0%%NAME% %GRAY%[%GOLD%注%GRAY%]{%WHITE%属性垃圾可做为 %ORANGE%手工 %WHITE%底材%CL%%TAN%提示%WHITE%: 可在%RED%地狱%WHITE%A1 恰西处 %TAN%注入%}
+ItemDisplay[(8hx OR 6hx OR 8mx OR 6mx) NMAG SOCK=0 ((AMAZON FILTLVL<3) OR FILTLVL=5)]:  %DOT-A8%%TIER-0%%NAME% %GRAY%[%GOLD%注%GRAY%]{%WHITE%属性垃圾可做为 %ORANGE%手工 %WHITE%底材%CL%%TAN%提示%WHITE%: 可在%RED%地狱%WHITE%A1 恰西处 %TAN%注入%}
+ItemDisplay[(ama OR amf) AMAZON FILTLVL=5 ETH NMAG SOCK=0]:  %NAME%%GRAY%[%GOLD%注%GRAY%]{%WHITE%属性垃圾可做为 %ORANGE%手工 %WHITE%底材%CL%%TAN%提示%WHITE%: 可在%RED%地狱%WHITE%A1 恰西处 %TAN%注入%}
 //刺客爪子
-ItemDisplay[(9xf OR 9tw OR 7xf OR 7tw) NMAG SOCK=0 ((ASSASSIN FILTLVL<5) OR FILTLVL=5)]: %DOT-A8%%TIER-0%%NAME% %GRAY%[%GOLD%注%GRAY%]{%WHITE%接着: 就可以把它做为 %ORANGE%手工 %WHITE%的底材%CL%%TAN%提示%WHITE%: 你可以在A1 恰西处 %YELLOW%注入 %WHITE%属性%CL%%NAME%}
+ItemDisplay[ASNCRAFT NMAG SOCK=0 ((ASSASSIN FILTLVL<5) OR FILTLVL=5)]: %DOT-A8%%TIER-0%%NAME% %GRAY%[%GOLD%注%GRAY%]{%WHITE%属性垃圾可做为 %ORANGE%手工 %WHITE%底材%CL%%TAN%提示%WHITE%: 可在%RED%地狱%WHITE%A1 恰西处 %TAN%注入%}
 //BB投掷武器
-ItemDisplay[(9gl OR 7gl OR 9ts OR 7ts)  NMAG ETH SOCK=0 ((AMAZON FILTLVL<5) OR (BARBARIAN FILTLVL<5) OR FILTLVL=5)]: %DOT-A8%%TIER-0%%NAME% %GRAY%[%GOLD%注%GRAY%]{%WHITE%接着: 就可以把它做为 %ORANGE%手工 %WHITE%的底材%CL%%TAN%提示%WHITE%: 你可以在A1 恰西处直接 %YELLOW%注入 %WHITE%属性%CL%%NAME%}
-ItemDisplay[(9b8 OR 7b8 OR 9bk OR 7bk)  NMAG ETH SOCK=0 BARBARIAN FILTLVL<3]: %DOT-A8%%TIER-0%%NAME% %GRAY%[%GOLD%注%GRAY%]{%WHITE%接着: 就可以把它做为 %ORANGE%手工 %WHITE%的底材%CL%%TAN%提示%WHITE%: 你可以在A1 恰西处直接 %YELLOW%注入 %WHITE%属性%CL%%NAME%}
+ItemDisplay[BARCRAFT NMAG SOCK=0]: %DOT-A8%%TIER-0%%NAME% %GRAY%[%GOLD%注%GRAY%]{%WHITE%属性垃圾可做为 %ORANGE%手工 %WHITE%底材%CL%%TAN%提示%WHITE%: 可在%RED%地狱%WHITE%A1 恰西处 %TAN%注入%CL%%RED%+    %WHITE%蛮子双投、回响%ORANGE%手工%WHITE%底材    %RED%+%CL%%NAME%}
+ItemDisplay[(9b8 OR 7b8 OR 9bk OR 7bk)  NMAG ETH SOCK=0 BARBARIAN FILTLVL<3]: %DOT-A8%%TIER-0%%NAME% %GRAY%[%GOLD%注%GRAY%]{%WHITE%属性垃圾可做为 %ORANGE%手工 %WHITE%底材%CL%%TAN%提示%WHITE%: 可在%RED%地狱%WHITE%A1 恰西处 %TAN%注入%}
 //德鲁伊木棒
-ItemDisplay[(9cl OR 9sp OR 7cl) NMAG SOCK=0 ((DRUID FILTLVL<5) OR FILTLVL=5)]: %DOT-A8%%TIER-0%%NAME% %GRAY%[%GOLD%注%GRAY%]{%WHITE%接着: 就可以把它做为 %ORANGE%手工 %WHITE%的底材%CL%%TAN%提示%WHITE%: 你可以在A1 恰西处直接 %YELLOW%注入 %WHITE%属性%CL%%NAME%}
+ItemDisplay[(9cl OR 9sp OR 7cl) NMAG SOCK=0 ((DRUID FILTLVL<5) OR FILTLVL=5)]: %DOT-A8%%TIER-0%%NAME% %GRAY%[%GOLD%注%GRAY%]{%WHITE%属性垃圾可做为 %ORANGE%手工 %WHITE%底材%CL%%TAN%提示%WHITE%: 可在%RED%地狱%WHITE%A1 恰西处 %TAN%注入%}
 //死灵盾
-ItemDisplay[NEC NMAG SOCK=0 (ELT OR EXC)  !ETH ((NECROMANCER FILTLVL<5) OR FILTLVL=5)]: %DOT-A8%%TIER-0%%NAME% %GRAY%[%GOLD%注%GRAY%]{%WHITE%接着: 就可以把它做为 %ORANGE%手工 %WHITE%的底材%CL%%TAN%提示%WHITE%: 你可以在A1 恰西处直接 %YELLOW%注入 %WHITE%属性%CL%%NAME%}
+ItemDisplay[NEC NMAG SOCK=0 (ELT OR EXC)  !ETH ((NECROMANCER FILTLVL<5) OR FILTLVL=5)]: %DOT-A8%%TIER-0%%NAME% %GRAY%[%GOLD%注%GRAY%]{%WHITE%属性垃圾可做为 %ORANGE%手工 %WHITE%底材%CL%%TAN%提示%WHITE%: 可在%RED%地狱%WHITE%A1 恰西处 %TAN%注入%}
 //S11彩蛋末日之刃
-ItemDisplay[7cr NMAG SOCK=0 !ETH (FILTLVL<3 OR FILTLVL=5)]: %NAME% %GRAY%[%GOLD%注%GRAY%]{%GOLD%有几率获得%RED%末日之刃 Armageddon's Blade%CL%%TAN%提示%WHITE%:在%RED%地狱%WHITE%A1 恰西处%TAN% 注入%CL%%NAME%}
+ItemDisplay[7cr NMAG SOCK=0 !ETH (FILTLVL<3 OR FILTLVL=5)]: %NAME% %GRAY%[%GOLD%注%GRAY%]{%GOLD%有几率获得%RED%末日之刃 Armageddon's Blade%CL%%TAN%提示%WHITE%: 在%RED%地狱%WHITE%A1 恰西处%TAN% 注入%CL%%NAME%}
 //
 // +----------------------------------------------------------------------------+
 // |      [NIRW] NMAG GOOD RW BASE                                              |
@@ -5296,7 +5296,7 @@ ItemDisplay[7cr NMAG SOCK=0 !ETH (FILTLVL<3 OR FILTLVL=5)]: %NAME% %GRAY%[%GOLD%
 //ItemDisplay[(6cs OR 6bs OR 6ws) NMAG !RW ((SK48=3 OR SK53=3 OR SK38=3) SK63=3) (SOCK=0 OR SOCK=4)]: %MAP-D6%%NAME% %GRAY%[%GOLD%无限%GRAY%]{%LTLINE%  %RED%Su%ORANGE%pe%YELLOW%r %GOLD%In%GREEN%fi%BLUE%ni%PURPLE%ty %CORAL%Base  %RTLINE%%CL%%NAME%}
 ItemDisplay[INFINITY]: %MAP-D6%%NAME% %GRAY%[%GOLD%无限%GRAY%] {%LTLINE%  %RED%In%ORANGE%fi%YELLOW%ni%PURPLE%ty %CORAL%Ba%GREEN%s%YELLOW%es  %RTLINE%%CL%%NAME%}%CONTINUE%
 ItemDisplay[INFINITY]: %NAME%{%RWLINE%%CL% %GOLD%无限:%CS%%RED%30#%CS%%WHITE%→%CS%%TAN%23#%CS%%WHITE%→%CS%%RED%30#%CS%%WHITE%→%CS%%ORANGE%24#%CL%%NAME%}
-
+//
 ItemDisplay[RWDOM OR RWFTH OR INFPHY OR RWCTA]: %NAME% {%GBLTLINE%  %RED%Ru%ORANGE%ne%YELLOW%Wo%PURPLE%rds %CORAL%Ba%GREEN%s%YELLOW%e  %GBRTLINE%%CL%%NAME%}%CONTINUE%
 //INFINITY PHY,Pride 骄傲,眼光 Insight
 ItemDisplay[INFPHY]: %NAME%{%WHITE%眼光: %DARK_GREEN%08# %WHITE%→ %TAN%03# %WHITE%→ %GRAY%07# %WHITE%→ %LIGHT_GRAY%12#%CL%%GOLD%刚毅: %LIGHT_GRAY%01# %WHITE%→ %BLUE%12# %WHITE%→ %SAGE%14# %WHITE%→ %TAN%28#%CL%%WHITE%骄傲: %RED%32# %WHITE%→ %TEAL%29# %WHITE%→ %SAGE%16# %WHITE%→ %ORANGE%28#%CL%%GOLD%无限: %ORANGE%30# %WHITE%→ %TAN%23# %WHITE%→ %ORANGE%30# %WHITE%→ %YELLOW%24#%CL%%NAME%}%CONTINUE%