From aa14b2a220a3fe0c189b8550fb97744a8580ecb2 Mon Sep 17 00:00:00 2001
From: lonelywolf <13281126@qq.com>
Date: Mon, 4 May 2026 08:23:21 +0000
Subject: [PATCH] S13V1.24

---
 build/01-物品集短名称定义.txt | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/build/01-物品集短名称定义.txt b/build/01-物品集短名称定义.txt
index 5ab0bed..8f1489a 100644
--- a/build/01-物品集短名称定义.txt
+++ b/build/01-物品集短名称定义.txt
@@ -288,14 +288,14 @@ Alias[STAFFBASE1_1]:(6ws (((SK39>1 OR SK59>1 OR SK64>1 OR SK369>1) SK65>1) OR (S
 Alias[STAFFBASE1_2]:((8cs OR 8bs OR 8ws OR 6ls OR 6cs OR 6bs OR 6ws) (SK48>2 OR SK49>2 OR SK38>2 OR SK53>2 OR SK57>2 OR SK63>2 OR SK383>2 OR SK376>2 OR SK61>2 OR SK51>2 OR SK47>2) (SOCK=0 OR SOCK=4)) 
 //2星
 Alias[STAFFBASE2_1]:((6ls OR 6cs OR 6bs OR 6ws) (((SK53=2 OR SK48=2 OR SK38=2 OR SK49=3) SK63=2) OR SK48=3 OR SK53=3 OR SK38=3 OR SK57=3 OR SK369=3 OR SK56=3) (SOCK=0 OR SOCK=4)) //2新星/连闪/充能弹/闪电、2电支 |3新星/连闪/充能弹/能量护盾/冰枪/陨石
-Alias[STAFFBASE2_2]:((6ls OR 6cs OR 6bs OR 6ws) SK57>0 (SK50>0 OR SK60>0) SOCK=5) //雷暴、冰盾
+Alias[STAFFBASE2_2]:((wst OR 8ws 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[STAFFBASE2_4]:(6ws ETH ED>14 !SOCK~1-3)  //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支配
-Alias[STAFFBASE3_3]:((6ls OR 6cs OR 6bs OR 6ws) SK58>0 SK57>0 (SK50>0 OR SK60>0) SOCK=5) //能量护盾、雷暴、冰盾
+Alias[STAFFBASE3_3]:((wst OR 8ws OR 6ws) SK58>0 SK57>0 (SK50>0 OR SK60>0) SOCK=5) //能量护盾、雷暴、冰盾
 Alias[STAFFBASE3_4]:(6ws (SK56=3 OR SK62=3) SK61=3 !SOCK~1-5) //3陨石/九头蛇、3火支配
 //4星
 Alias[STAFFBASE4_1]:((6ls OR 6cs OR 6bs OR 6ws) (SK53=3 OR SK48=3 OR SK38=3) SK63=3 (SOCK=0 OR SOCK=4)) //3新星/连闪/充能弹、3电支