diff --git a/build/01-物品集短名称定义.txt b/build/01-物品集短名称定义.txt
index fad65da..43456e9 100644
--- a/build/01-物品集短名称定义.txt
+++ b/build/01-物品集短名称定义.txt
@@ -32,7 +32,7 @@ Alias[LOWVENGSFX]:(SUFFIX=695 OR SUFFIX=699 OR SUFFIX=703 OR SUFFIX=707 OR SUFFI
 //城镇
 Alias[TOWN]:(MAPID=1 OR MAPID=40 OR MAPID=75 OR MAPID=103 OR MAPID=109)
 //已知T图
-Alias[KNOWNMAPS]:(t11 OR t12 OR t13 OR t14 OR t15 OR t16 OR t17 OR t21 OR t22 OR t23 OR t24 OR t25 OR t26 OR t27 OR t28 OR t31 OR t32 OR t33 OR t34 OR t35 OR t36 OR t37 OR t38 OR t39 OR t3a OR t41 OR t42 OR t43 OR t44 OR t51 OR t52 OR t53 OR t54 OR t55 OR t56)
+Alias[KNOWNMAPS]:(t11 OR t12 OR t13 OR t14 OR t15 OR t16 OR t17 OR t21 OR t22 OR t23 OR t24 OR t25 OR t26 OR t27 OR t28 OR t31 OR t32 OR t33 OR t34 OR t35 OR t36 OR t37 OR t38 OR t39 OR t3a OR t3b OR t41 OR t42 OR t43 OR t44 OR t51 OR t52 OR t53 OR t54 OR t55 OR t56 OR t57 OR t58)
 
 //                                                  ++++++  4.2，暗金装备星级  ++++++
 //PD2新暗金装备
@@ -290,6 +290,7 @@ Alias[STAFFBASE2_1]:((6ls OR 6cs OR 6bs OR 6ws) (((SK53=2 OR SK48=2 OR SK38=2 OR
 Alias[STAFFBASE2_2]:((6ls OR 6cs OR 6bs OR 6ws) SK57>0 (SK50>0 OR SK60>0) SOCK=5) //雷暴、冰盾
 Alias[STAFFBASE2_3]:(6ws (SK39=3 OR SK59=3) SK46>0 !SOCK~1-5) //3冰霜弹/暴风雪、足跟火
 Alias[STAFFBASE2_4]:(6ws ETH ED>14 !SOCK=1)  //15ED无形执政官
+Alias[SORBASE2_1]:(SOR MAXSOCKETS>2 (SK64>1 SK65>1) !SOCK~1-2)
 //3星
 Alias[STAFFBASE3_1]:((6ls OR 6cs OR 6bs OR 6ws) (SK53=3 OR SK48=3 OR SK38=3) SK63=2 (SOCK=0 OR SOCK=4)) //3新星/连闪/充能弹、2电支
 Alias[STAFFBASE3_2]:((6ls OR 6cs OR 6bs OR 6ws) ((SK52=3 SK61>0) OR (SK40=3 SK65>0)) (SOCK=0 OR SOCK=4 OR SOCK=5)) //3强化、1支配
@@ -580,16 +581,16 @@ ItemDisplay[MAPTIER>0 !ID UNI]:%SOUNDID-35%%NAME%{%NAME%}%CONTINUE% //hellforges
 Formula[SMA]: MULTI107,251+MULTI107,252+MULTI107,253+MULTI107,254+MULTI107,255+MULTI107,256+MULTI107,257+MULTI107,258+MULTI107,259+MULTI107,260+MULTI107,261+MULTI107,262+MULTI107,263+MULTI107,264+MULTI107,265+MULTI107,266+MULTI107,267+MULTI107,268+MULTI107,269+MULTI107,270+MULTI107,271+MULTI107,272+MULTI107,273+MULTI107,274+MULTI107,275+MULTI107,276+MULTI107,277+MULTI107,278+MULTI107,279+MULTI107,280+MULTI107,366+MULTI107,66+MULTI107,67+MULTI107,68+MULTI107,69+MULTI107,70+MULTI107,71+MULTI107,72+MULTI107,73+MULTI107,74+MULTI107,75+MULTI107,76+MULTI107,77+MULTI107,78+MULTI107,79+MULTI107,80+MULTI107,81+MULTI107,82+MULTI107,83+MULTI107,84+MULTI107,85+MULTI107,86+MULTI107,87+MULTI107,88+MULTI107,89+MULTI107,90+MULTI107,91+MULTI107,92+MULTI107,93+MULTI107,94+MULTI107,95+MULTI107,367+MULTI107,381+MULTI107,374+MULTI107,126+MULTI107,128+MULTI107,130+MULTI107,131+MULTI107,132+MULTI107,133+MULTI107,134+MULTI107,135+MULTI107,136+MULTI107,137+MULTI107,138+MULTI107,139+MULTI107,140+MULTI107,141+MULTI107,142+MULTI107,143+MULTI107,144+MULTI107,145+MULTI107,146+MULTI107,147+MULTI107,148+MULTI107,149+MULTI107,150+MULTI107,151+MULTI107,152+MULTI107,153+MULTI107,154+MULTI107,155+MULTI107,368+MULTI107,221+MULTI107,222+MULTI107,223+MULTI107,224+MULTI107,225+MULTI107,226+MULTI107,227+MULTI107,228+MULTI107,229+MULTI107,230+MULTI107,231+MULTI107,232+MULTI107,233+MULTI107,234+MULTI107,235+MULTI107,236+MULTI107,237+MULTI107,238+MULTI107,239+MULTI107,240+MULTI107,241+MULTI107,242+MULTI107,243+MULTI107,244+MULTI107,245+MULTI107,246+MULTI107,247+MULTI107,248+MULTI107,249+MULTI107,250+MULTI107,370+MULTI107,96+MULTI107,97+MULTI107,98+MULTI107,99+MULTI107,100+MULTI107,101+MULTI107,102+MULTI107,103+MULTI107,104+MULTI107,105+MULTI107,106+MULTI107,107+MULTI107,108+MULTI107,109+MULTI107,110+MULTI107,111+MULTI107,112+MULTI107,113+MULTI107,114+MULTI107,115+MULTI107,116+MULTI107,117+MULTI107,118+MULTI107,119+MULTI107,120+MULTI107,121+MULTI107,122+MULTI107,123+MULTI107,124+MULTI107,125+MULTI107,364+MULTI107,371+MULTI107,378+MULTI107,36+MULTI107,37+MULTI107,38+MULTI107,39+MULTI107,40+MULTI107,41+MULTI107,42+MULTI107,43+MULTI107,44+MULTI107,45+MULTI107,46+MULTI107,47+MULTI107,48+MULTI107,49+MULTI107,50+MULTI107,51+MULTI107,52+MULTI107,53+MULTI107,54+MULTI107,55+MULTI107,56+MULTI107,57+MULTI107,58+MULTI107,59+MULTI107,60+MULTI107,61+MULTI107,62+MULTI107,63+MULTI107,64+MULTI107,65+MULTI107,369+MULTI107,383+MULTI107,376
 
 //战系戒指有用属性之和
-Formula[RA]:MAXDMG*12+MINDMG*12+STR*6+STAT3*6+DEX*6+STAT60*13+STAT62*17+STAT110*5+STAT96*12+FCR*10+LIFE*2+CRES*3+FRES*3+LRES*3+PRES*3+AR+MANA/2+STAT118*120
+Formula[RA]:MAXDMG*12+MINDMG*12+STR*6+STAT3*6+DEX*6+STAT60*13+STAT62*17+STAT110*5+STAT96*12+FCR*10+LIFE*2+CRES*3+FRES*3+LRES*3+PRES*3+AR+MANA/2+STAT118*120+STAT86*15+STAT138*15
 //法系戒指有用属性之和
-Formula[RB]:STR*6+STAT3*6+STAT1*6+DEX*6+STAT110*5+STAT96*8+FCR*15+LIFE*3+CRES*3+FRES*3+LRES*3+PRES*4+MANA+STAT118*120+STAT86*40
+Formula[RB]:STR*6+STAT3*6+STAT1*6+DEX*6+STAT110*5+STAT96*8+FCR*15+LIFE*3+CRES*3+FRES*3+LRES*3+PRES*4+MANA+STAT118*120+STAT86*20+STAT138*20
 //防御戒指有用属性之和
 Formula[RC]:STR*6+STAT3*6+DEX*6+STAT110*6+STAT96*8+LIFE*5/2+CRES*4+FRES*4+LRES*3+PRES*4+STAT118*120
 
 //战系项链有用属性之和
-Formula[AA]:STR*4+STAT3*4+DEX*4+STAT60*10+STAT62*10+STAT96*10+STAT99*10+FCR*12+LIFE*3/2+STAT110*2+STAT96*8+MAXDMG*7+MINDMG*7+CRES*5+FRES*5+LRES*4+PRES*5+AR+MANA/2+STAT118*120+STAT127*120+EDAM*4+STAT156*6
+Formula[AA]:STR*4+STAT3*4+DEX*4+STAT60*10+STAT62*10+STAT96*10+STAT99*10+FCR*12+LIFE*3/2+STAT110*2+STAT96*8+MAXDMG*7+MINDMG*7+CRES*5+FRES*5+LRES*4+PRES*5+AR+MANA/2+STAT118*120+STAT127*120+EDAM*4+STAT156*6+STAT86*15+STAT138*15
 //法系项链有用属性之和
-Formula[AB]:STR*4+STAT3*4+DEX*4+STAT1*4+STAT99*10+STAT96*10+STAT99*10+FCR*15+LIFE*2+STAT110*2+STAT96*6+CRES*5+FRES*5+LRES*4+PRES*5+MANA+STAT118*120+STAT127*120+STAT138*40+STAT86*25+STAT156*6
+Formula[AB]:STR*4+STAT3*4+DEX*4+STAT1*4+STAT99*10+STAT96*10+STAT99*10+FCR*15+LIFE*2+STAT110*2+STAT96*6+CRES*5+FRES*5+LRES*4+PRES*5+MANA+STAT118*120+STAT127*120+STAT138*20+STAT86*20+STAT156*6
 //防御项链有用属性之和
 Formula[AC]:STR*4+STAT3*4+DEX*4+STAT99*12+LIFE*2+STAT110*2+STAT96*6+CRES*5+FRES*5+LRES*2+PRES*5+STAT118*120+STAT127*120+STAT156*6+MAXRES*75