From 605b6af58bd47984cb1f8f5863420427e7a41484 Mon Sep 17 00:00:00 2001
From: Vagrim <vagrim@whatever.com>
Date: Wed, 21 Oct 2026 19:20:22 +0800
Subject: [PATCH] v1.2.3
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

高伤武器改为差满ED<100判定并合并手工差距；女族长标枪嫉妒底材增加无孔显示
---
 ViLoot.txt | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

diff --git a/ViLoot.txt b/ViLoot.txt
index dcc141e..a4f48ff 100644
--- a/ViLoot.txt
+++ b/ViLoot.txt
@@ -103,10 +103,6 @@ Alias[2_STAR_CRAFT]: %NAME% %GRAY%[%ORANGE%C%GRAY%] %GREEN%**
 Alias[1_STAR_CRAFT]: %NAME% %GRAY%[%ORANGE%C%GRAY%] %DARK_GREEN%*
 Alias[CRAFT_NAME]: %NAME% %GRAY%[%ORANGE%C%GRAY%]
 //NOTICE ME, THAT's ME
-//High ED Amp Proc Combo
-Alias[EAWEAPON]: (WEAPON ID (MAG OR RARE OR CRAFT) (ED>299 AND (SUFFIX=662 OR SUFFIX=898 OR SUFFIX=899)) !RW !SHOP !EQUIPPED)
-//High ED Weapon
-Alias[EDWEAPON]: (WEAPON ID ED>399 !SHOP !EQUIPPED)
 //sk, 20ias Gloves
 Alias[SKGLOVE]: (GLOVES (MAG OR RARE OR CRAFT) $f(TABSK0+TABSK1+TABSK2+TABSK32+TABSK41+TABSK50)>1 IAS>19 !RW !SHOP !EQUIPPED)
 //100+RES BOOTS
@@ -3646,13 +3642,15 @@ ItemDisplay[rin UNI ID MULTI204,14469>0]: %NAME%{%WHITE%橡木智者: %CORAL%生
 // |      [ITWE] Weapon                                                         |
 // +----------------------------------------------------------------------------+
 //
+//High ED Weapon + AMP
+Alias[EAWEAPON]: (WEAPON ID (MAG OR RARE OR CRAFT) !RW !EQUIPPED ($f(IF(OR(BOW,XBOW),600,550)-IF(CRAFT,20,0)-ED)<100 AND (SUFFIX=662 OR SUFFIX=898 OR SUFFIX=899)))
+Alias[EDWEAPON]: (WEAPON ID (MAG OR RARE OR CRAFT) !RW !EQUIPPED ($f(IF(OR(BOW,XBOW),600,550)-IF(CRAFT,20,0)-ED)<100 IF(OR(SUFFIX=662,SUFFIX=898,SUFFIX=899),FALSE,TRUE)))
 //High ED Amp Proc Combo
-ItemDisplay[(EAWEAPON)]: %NAME%{%TIPLTS%  %RED%高%ORANGE%伤 %GRAY%+ %GREEN%伤%BLUE%害%PURPLE%加%GOLD%深  %TIPRTS%%CL%%NAME%}%CONTINUE%
+ItemDisplay[EAWEAPON]: %NAME%{%TIPLTS%  %RED%高%ORANGE%伤 %GRAY%+ %GREEN%伤%BLUE%害%PURPLE%加%GOLD%深  %TIPRTS%%CL%%NAME%}%CONTINUE%
 //High ED Weapon
-//ItemDisplay[(EDWEAPON) !(EAWEAPON)]: %NAME%{%TIPLTS%  %RED%Hi%ORANGE%gh %YELLOW%ED %GREEN%We%BLUE%a%PURPLE%p%WHITE%on  %TIPRTS%%CL%%NAME%}
+//ItemDisplay[EDWEAPON]: %NAME%{%TIPLTS%  %RED%Hi%ORANGE%gh %YELLOW%ED %GREEN%We%BLUE%a%PURPLE%p%WHITE%on  %TIPRTS%%CL%%NAME%}
 // PREFIX=193 200ed,194 300ed,753 400ED,264 150ed&250ar,756 200ed&300ar(弓弩限定)
-ItemDisplay[(MAG OR RARE) (EDWEAPON) !(EAWEAPON)]: %NAME%{%TIPLTS%      %RED%高%ORANGE%伤%WHITE%武%PURPLE%器 %GRAY%(差$f(IF(OR(BOW,XBOW),600,550)-ED) 满ED)     %TIPRTS%%CL%%NAME%}%CONTINUE%
-ItemDisplay[CRAFT (EDWEAPON) !(EAWEAPON)]: %NAME%{%TIPLTS%      %RED%高%ORANGE%伤%WHITE%武%PURPLE%器 %GRAY%(差$f(IF(OR(BOW,XBOW),580,530)-ED) 满ED)     %TIPRTS%%CL%%NAME%}%CONTINUE%
+ItemDisplay[EDWEAPON]: %NAME%{%TIPLTS%      %RED%高%ORANGE%伤%WHITE%武%PURPLE%器 %GRAY%(差$f(IF(OR(BOW,XBOW),600,550)-IF(CRAFT,20,0)-ED) 满ED)     %TIPRTS%%CL%%NAME%}%CONTINUE%
 //Teleport Charges
 ItemDisplay[(TPITEM)]: %NAME%{%NAME%%CL%%PURPLE%+    %RED%传送    %PURPLE%+}%CONTINUE%
 //Lower Resist CTC 
@@ -6320,7 +6318,7 @@ ItemDisplay[NMAG !RW !SHOP MACE SOCK=6 !GROUND]: %NAME%{%LASTWISH%%BOTD%%ASYLUM%
 ItemDisplay[NMAG !RW !SHOP THROWING SOCK=2 !GROUND]: %NAME%{%ZEPHYR%%WIND%%STRENGTH%%STEEL%%ECHO%%CL%%NAME%}%CONTINUE% // throw 2s
 ItemDisplay[NMAG !RW !SHOP THROWING SOCK=3 !GROUND]: %NAME%{%PLAGUE%%FURY%%VENOM%%CRESCENT_MOON%%LAWBRINGER%%KINGS_GRACE%%MALICE%%CL%%NAME%}%CONTINUE% // throw 3s
 ItemDisplay[NMAG !RW !SHOP QUIVER SOCK=2 !GROUND]: %NAME%{%ECHO%%ANCIENT_SCRIPTURE%%ANCIENT_FORESIGHT%%CL%%NAME%}%CONTINUE%	// throw 2s
-ItemDisplay[NMAG !RW !SHOP amf SOCK=3 !GROUND]: %NAME%{%JEALOUSY%%CL%%NAME%}%CONTINUE%
+ItemDisplay[NMAG !RW !SHOP amf (SOCK=0 OR SOCK=3) !GROUND]: %NAME%{%JEALOUSY%%CL%%NAME%}%CONTINUE%
 ItemDisplay[NMAG !RW !SHOP SOCK~2-6 !GROUND]: %NAME%{%RWCLOSED%}%CONTINUE%
 //
 // +----------------------------------------------------------------------------+