diff --git a/build/01-物品集短名称定义.txt b/build/01-物品集短名称定义.txt
index c94f31c..e4c7e57 100644
--- a/build/01-物品集短名称定义.txt
+++ b/build/01-物品集短名称定义.txt
@@ -331,7 +331,7 @@ Alias[SINBASE4_2]:(((SIN ELT) OR 9tw OR 9lw) (SK252=3 OR SK263=3 OR SK275>0) SK2
 //投掷武器
 //2星
 Alias[THROWINGBASE2_1]:((7gl OR 7ts OR 7b8) !SOCK=1 ETH ED>9) //2-3孔无形鬼魂尖枪、翼鱼叉、翼斧
-Alias[THROWINGBASE2_2]:(amf AUTOMOD=9 ETH !SOCK=1 ED>9) //2孔无形3技能女族长
+Alias[THROWINGBASE2_2]:(amf AUTOMOD=9 ETH !SOCK=1 ED>9) //2、3孔无形3技能女族长
 
 //                                                  ++++++  4.5，商店MF品目  ++++++
 //SHOPHUNT01 - HIGH ED
@@ -373,28 +373,6 @@ Alias[SHOPHUNT18]: ((GLOVES OR BELT) MAG ((PRES>14 DIFF=0) OR (PRES>24 DIFF>0)))
 //SHOPHUNT19 - POISON RES BOOTS
 Alias[SHOPHUNT19]: (BOOTS MAG ((PRES>14 DIFF=0) OR (PRES>24 DIFF=1) OR (PRES>34 DIFF=2)))
 
-//NOTICE ME, THAT's ME
-//High ED Amp Proc Combo
-Alias[NOTICEME01]: (WEAPON (MAG OR RARE OR CRAFT) (ED>299 AND (SUFFIX=662 OR SUFFIX=898 OR SUFFIX=899)) !RW !SHOP !EQUIPPED !MERC)
-//High ED Weapon
-Alias[NOTICEME02]: (WEAPON (MAG OR RARE OR CRAFT) ED>399 !SHOP !EQUIPPED !MERC)
-//3sk, 20ias Gloves
-Alias[NOTICEME03]: (GLOVES (MAG OR RARE OR CRAFT) (TABSK0>2 OR TABSK2>2 OR TABSK50>2) AND IAS>19 !RW !SHOP !EQUIPPED !MERC)
-//3sk, 10fcr Gloves
-Alias[NOTICEME04]: (GLOVES (MAG OR RARE OR CRAFT) (TABSK1>2 AND FCR>9) !RW !SHOP !EQUIPPED !MERC)
-//Teleport Charges
-Alias[NOTICEME05]: (STAFF (MAG OR RARE OR CRAFT) CHSK54>0 !RW !SHOP !EQUIPPED !MERC)
-//Lower Resist CTC
-Alias[NOTICEME06]: (WEAPON (MAG OR RARE OR CRAFT) (SUFFIX=909 OR SUFFIX=912) !RW !SHOP !EQUIPPED !MERC)
-//Amplify Damage CTC
-Alias[NOTICEME07]: (WEAPON (MAG OR RARE OR CRAFT) (SUFFIX=899 OR SUFFIX=906) !RW !SHOP !EQUIPPED !MERC)
-//Lower Resist Charges
-Alias[NOTICEME08]: (WEAPON (MAG OR RARE OR CRAFT) (SUFFIX=594 OR SUFFIX=595) !RW !SHOP !EQUIPPED !MERC)
-//Life Tap Charges
-Alias[NOTICEME09]: (WEAPON (MAG OR RARE OR CRAFT) (SUFFIX=578 OR SUFFIX=579) !RW !SHOP !EQUIPPED !MERC)
-//High ED Weapon + Mods
-Alias[NOTICEME10]: (WEAPON (MAG OR RARE OR CRAFT) ED>349 ((STAT21+STAT22+STAT23+STAT24+STAT159+STAT160>14) OR STAT141>0 OR STAT136>0 OR IAS>29 OR (STAT121+STAT122>50) OR STAT218>0 OR STAT219>0 OR STAT252>0 OR STAT501>285) !SHOP !EQUIPPED !MERC)
-
 //                                                  ++++++  4.6，有用的亮金词缀  ++++++
 //项链
 //法系3+2/2+3
@@ -581,26 +559,26 @@ ItemDisplay[cm3 UNI !ID !TOWN]:%SOUNDID-3918%%NAME%{%NAME%}%CONTINUE% //gheed_gr
 ItemDisplay[RUNE>25 !TOWN]:%SOUNDID-418%%NAME%{%NAME%}%CONTINUE% //cairn_success - for HRs
 ItemDisplay[(RUNE~20-25 OR lpp) !TOWN]:%SOUNDID-248%%NAME%{%NAME%}%CONTINUE% //item_whip - for Mid Runes an Larzuk Puzzlepiece
 //超级BOSS独特暗金
-ItemDisplay[(PD2UBERUNI1 OR PD2UBERUNI2) UNI !ID !TOWN]:%SOUNDID-27%%NAME%{%NAME%}%CONTINUE% //quest_anyasteam - for Uber Items
+ItemDisplay[(PD2UBERUNI1 OR PD2UBERUNI2) UNI !ID !TOWN]:%SOUNDID-4695%%NAME%{%NAME%}%CONTINUE% //diabloaction - for Uber Items
 //4星-暗金物品
-ItemDisplay[(PD2GGUNIETH1 OR PD2GGUNI1 OR LODGGUNIETH1 OR LODGGUNI1) UNI !ID !TOWN]:%SOUNDID-4723%%NAME%{%NAME%}%CONTINUE% //quest_hellforge_place - for GG's
+ItemDisplay[(PD2GGUNIETH1 OR PD2GGUNI1 OR LODGGUNIETH1 OR LODGGUNI1) UNI !ID !TOWN]:%SOUNDID-4723%%NAME%{%NAME%}%CONTINUE% //dropsounds-tink10 - for GG's
 //3星-暗金防具
-ItemDisplay[(PD2OKUNI1 OR PD2OKUNI3 OR LODOKUNIETH1 OR LODOKUNI1 OR LODOKUNI2 OR LODOKUNI3 OR LODOKUNI4 OR LODOKUNI5 OR LODOKUNI6) UNI !ID !TOWN]:%SOUNDID-4725%%NAME%{%NAME%}%CONTINUE% //object_gibbet_impact - for equipment: armors
+ItemDisplay[(PD2OKUNI1 OR PD2OKUNI3 OR LODOKUNIETH1 OR LODOKUNI1 OR LODOKUNI2 OR LODOKUNI3 OR LODOKUNI4 OR LODOKUNI5 OR LODOKUNI6) UNI !ID !TOWN]:%SOUNDID-4725%%NAME%{%NAME%}%CONTINUE% //dropsounds-tink12 - for equipment: armors
 //3星-暗金武器
-ItemDisplay[(PD2OKUNIETH1 OR PD2OKUNI2 OR LODOKUNIETH2 OR LODOKUNI7 OR LODOKUNI8) UNI !ID !TOWN]:%SOUNDID-4724%%NAME%{%NAME%}%CONTINUE% //object_malus - for equipment: weapons
+ItemDisplay[(PD2OKUNIETH1 OR PD2OKUNI2 OR LODOKUNIETH2 OR LODOKUNI7 OR LODOKUNI8) UNI !ID !TOWN]:%SOUNDID-4724%%NAME%{%NAME%}%CONTINUE% //dropsounds-tink11 - for equipment: weapons
 //3星-绿色套装
-ItemDisplay[(OKSETETH1 OR OKSET1) SET !ID !TOWN]:%SOUNDID-4729%%NAME%{%NAME%}%CONTINUE% //greatermummy_unholybolt_cast - for good set items
+ItemDisplay[(OKSETETH1 OR OKSET1) SET !ID !TOWN]:%SOUNDID-4729%%NAME%{%NAME%}%CONTINUE% //dropsounds-tink16 - for good set items
 //超级稀有物品
-ItemDisplay[(llmr OR lsvl OR rkey OR rid OR rtp) !TOWN]:%SOUNDID-4717%%NAME%{%NAME%}%CONTINUE% //bloodraven_mist_begin - for Super Rares like Lilith Mirror
+ItemDisplay[(llmr OR lsvl OR rkey OR rid OR rtp) !TOWN]:%SOUNDID-1211%%NAME%{%NAME%}%CONTINUE% //izual-fadein - for Super Rares like Lilith Mirror
 //谜盒和恶魔宝盒
-ItemDisplay[(lbox OR imrn) !TOWN]:%SOUNDID-4718%%NAME%{%NAME%}%CONTINUE% //bloodraven_mist_end - for Rares lbox, demonic cube etc.
+ItemDisplay[(lbox OR imrn) !TOWN]:%SOUNDID-4730%%NAME%{%NAME%}%CONTINUE% //nakrul\NaKrul_attack1 - for Rares lbox, demonic cube etc.
 //超级BOSS门票
-ItemDisplay[(ubtm OR dcma OR dcso OR dcbl OR dcho OR rtma OR rtmv OR rtmo OR cm2f OR rtmf OR luca OR lucb OR lucc OR lucd) !TOWN]:%SOUNDID-4721%%NAME%{%NAME%}%CONTINUE% //greatermummy_resurrect_1 - for Uber Ingredients
+ItemDisplay[(ubtm OR dcma OR dcso OR dcbl OR dcho OR rtma OR rtmv OR rtmo OR cm2f OR rtmf OR luca OR lucb OR lucc OR lucd) !TOWN]:%SOUNDID-705%%NAME%{%NAME%}%CONTINUE% //darkwanderer-death - for Uber Ingredients
 //暗金地图
-ItemDisplay[MAPTIER>0 !ID UNI]:%SOUNDID-4719%%NAME%{%NAME%}%CONTINUE% //hellforgesmash - for unique maps
+ItemDisplay[MAPTIER>0 !ID UNI]:%SOUNDID-4719%%NAME%{%NAME%}%CONTINUE% //dropsounds-tink06 - for unique maps
 //备用-有趣音效
-//ItemDisplay[RARE () !TOWN]:%SOUNDID-705%%NAME%{%NAME%}%CONTINUE% //darkwanderer_death - spare sound for... ???
-.playsound [sound-4721]
+//ItemDisplay[RARE () !TOWN]:%SOUNDID-663%%NAME%{%NAME%}%CONTINUE% //catapult_death - spare sound for... ???
+//ItemDisplay[RARE () !TOWN]:%SOUNDID-27%%NAME%{%NAME%}%CONTINUE% //quest_anyasteam - spare sound for... ???
 
 //                                                  ++++++  4.8，自定义公式  ++++++
 //所有STAFFMOD之和
@@ -621,11 +599,11 @@ Formula[MFC]: max(1,min(10,round(if((((100+STAT372)*(100+STAT370)*(80+STAT372)*(
 //头盔
 Formula[C_HELM]: OR(STAT360==7,STAT360==33)*0.25+OR(STAT360==34,STAT360==36,STAT360==37,STAT360==38,STAT360==39,STAT360==48)*0.5+OR(STAT360==8,STAT360==9,STAT360==51,STAT360==57,STAT360==58, STAT360==62)*0.8+OR(STAT360==35,STAT360==43,STAT360==45,STAT360==59)*1.6+OR(STAT360==50,STAT360==52,STAT360==53,STAT360==54,STAT360==55,STAT360==56)*2.25+AND(STAT360==32,SOCKETS==2)+AND(STAT360==32,SOCKETS==3)*2.25+AND(STAT360!=32,SOCKETS==2)*0.75
 //盔甲
-Formula[C_CHEST]: OR(STAT360==7,STAT360==33,STAT360==41,STAT360==10)*0.25+OR(STAT360==36,STAT360==37,STAT360==38,STAT360==39,STAT360==48)*0.5+OR(STAT360==44,STAT360==46,STAT360==47,STAT360==62)*0.8+OR(STAT360==35,STAT360==42,STAT360==43,STAT360==45,STAT360==51)*1.6+OR(STAT360==50,STAT360==52,STAT360==53,STAT360==54,STAT360==55,STAT360==56)*2.25+AND(STAT360==32,SOCKETS==3)*2+AND(STAT360==32,SOCKETS==2)+AND(STAT360!=32,SOCKETS==2)*0.75
+Formula[C_CHEST]: OR(STAT360==7,STAT360==33,STAT360==41,STAT360==10)*0.25+OR(STAT360==36,STAT360==37,STAT360==38,STAT360==39)*0.5+OR(STAT360==44,STAT360==46,STAT360==47,STAT360==62)*0.8+OR(STAT360==35,STAT360==42,STAT360==43,STAT360==45,STAT360==51,STAT360==48)*1.6+OR(STAT360==50,STAT360==52,STAT360==53,STAT360==54,STAT360==55,STAT360==56)*2.25+AND(STAT360==32,SOCKETS==3)*2+AND(STAT360==32,SOCKETS==2)+AND(STAT360!=32,SOCKETS==2)*0.75
 //箭矢
 Formula[C_QUIVER]: OR(STAT360==7,STAT360==60)*0.25+OR(STAT360==36,STAT360==37,STAT360==38,STAT360==39,STAT360==61)*0.5+OR(STAT360==3,STAT360==57,STAT360==58,STAT360==44,STAT360==62)*0.8+OR(STAT360==66,STAT360==74,STAT360==51,STAT360==35,STAT360==75,STAT360==76,STAT360==20)*1.6+OR(STAT360==63,STAT360==12,STAT360==14,STAT360==2,STAT360==50)*2.25+AND(STAT360==32,SOCKETS==2)+AND(STAT360!=32,SOCKETS==2)*0.75
 //盾牌
-Formula[C_SHIELD]: OR(STAT360==7,STAT360==41)*0.25+OR(STAT360==36,STAT360==37,STAT360==38,STAT360==39,STAT360==48,STAT360==61,STAT360==64,STAT360==20)*0.5+OR(STAT360==46,STAT360==47,STAT360==62,STAT360==73,STAT360==42)*0.8+OR(STAT360==43,STAT360==48,STAT360==51)*1.6+OR(STAT360==50,STAT360==52,STAT360==53,STAT360==54,STAT360==55,STAT360==56)*2.25+AND(STAT360==32,SOCKETS==3)*2+AND(STAT360==32,SOCKETS==2)+AND(STAT360!=32,SOCKETS==2)*0.75
+Formula[C_SHIELD]: OR(STAT360==7,STAT360==41)*0.25+OR(STAT360==36,STAT360==37,STAT360==38,STAT360==39,STAT360==61,STAT360==64,STAT360==20)*0.5+OR(STAT360==46,STAT360==47,STAT360==62,STAT360==73,STAT360==42)*0.8+OR(STAT360==35,STAT360==43,STAT360==48,STAT360==51)*1.6+OR(STAT360==50,STAT360==52,STAT360==53,STAT360==54,STAT360==55,STAT360==56)*2.25+AND(STAT360==32,SOCKETS==3)*2+AND(STAT360==32,SOCKETS==2)+AND(STAT360!=32,SOCKETS==2)*0.75
 //鞋子
 Formula[C_BOOTS]: OR(STAT360==7,STAT360==33,STAT360==60,STAT360==40)*0.25+OR(STAT360==36,STAT360==37,STAT360==38,STAT360==39,STAT360==64,STAT360==48)*0.5+OR(STAT360==61,STAT360==67,STAT360==49)*0.8+OR(STAT360==8,STAT360==9,STAT360==51,STAT360==35,STAT360==44,STAT360==34)*1.6+OR(STAT360==52,STAT360==53,STAT360==54,STAT360==55,STAT360==56)*2
 //手套
@@ -722,7 +700,7 @@ Formula[RQU_C]:(CRES/60+FRES/60+LRES/60+PRES/60+IAS/20+STAT110/75+STAT118*0.8+ST
 
 //亮金/手工武器评测函数
 //物理系
-Formula[RWP_A]:(IAS/40+ED/176+MAXDMG/40+MINDMG/40+AR/900+STAT136/60+STAT141/30+STAT194/5+STAT121/400+STAT122/500+IF(MULTI198,28319=12,1,0)+IF(MULTI198,28311=10,0.5,0)+STAT116/40)*1.17-IF(STAT360==3,0.33,0)-OR(STAT360==2,STAT360==77,STAT360==24)*0.53-OR(STAT360==5,STAT360==21)*0.59-OR(STAT360==19,STAT360==26,STAT360==20)*1.17-IF(STAT360==22,1.32,0)-OR(STAT360==23,STAT360==25)*1.46
+Formula[RWP_A]:(IAS/40+ED/176+MAXDMG/40+MINDMG/40+AR/900+STAT136/60+STAT141/30+STAT194/5+STAT121/400+STAT122/500+IF(MULTI198,28319=12,1,0)+IF(MULTI198,28311=10,0.5,0)+STAT116/40+IF(STAT252>0,1,0))*1.17-IF(STAT360==3,0.33,0)-OR(STAT360==2,STAT360==77,STAT360==24)*0.53-OR(STAT360==5,STAT360==21)*0.59-OR(STAT360==19,STAT360==26,STAT360==20)*1.17-IF(STAT360==22,1.32,0)-OR(STAT360==23,STAT360==25)*1.46
 Formula[RWP_B]:(STAT81+IAS/40+ED/193+MAXDMG/50+MINDMG/40+AR/900+STAT136/50+STAT141/50+STAT194/5+STAT121/400+STAT122/500+IF(MULTI198,28319=12,1,0)+IF(MULTI198,28311=10,0.5,0))*1.17-IF(STAT360==3,0.33,0)-OR(STAT360==2,STAT360==77,STAT360==24)*0.53-OR(STAT360==5,STAT360==21)*0.59-OR(STAT360==19,STAT360==26,STAT360==20)*1.17-IF(STAT360==22,1.32,0)-OR(STAT360==23,STAT360==25)*1.46
 //法系-打击
 Formula[RWP_C]:(ALLSK+IAS/40+AR/900+STAT136/45+STAT141/90+STAT194/5+STAT86/5+STAT138/5+STAT333/10+STAT334/10+STAT335/10+STAT336/10+IF(MULTI198,28623=12,1,0)+IF(MULTI198,28618=10,0.5,0))*1.17-IF(STAT360==21,0.77,0)-OR(STAT360==8,STAT360==9,STAT360==12,STAT360==13,STAT360==14,STAT360==15,STAT360==20)*1.17-IF(STAT360==23,1.65,0)