summaryrefslogtreecommitdiff
path: root/world/map/npc
diff options
context:
space:
mode:
authorLed Mitz <smoothshifter@tuta.io>2023-11-27 17:27:47 +0000
committerLed Mitz <smoothshifter@tuta.io>2023-11-27 17:27:47 +0000
commit80fc0f727cef5169ef1a1fb1d05196f2d429b156 (patch)
treec97cddc909cd275b8f1dc472b578706408ef43d6 /world/map/npc
parent3adc26d97144c91a6d942bb81f44273aaa2ba8e6 (diff)
parentaadbc929974d84f38ca976a9168f45a81ba24455 (diff)
downloadserverdata-80fc0f727cef5169ef1a1fb1d05196f2d429b156.tar.gz
serverdata-80fc0f727cef5169ef1a1fb1d05196f2d429b156.tar.bz2
serverdata-80fc0f727cef5169ef1a1fb1d05196f2d429b156.tar.xz
serverdata-80fc0f727cef5169ef1a1fb1d05196f2d429b156.zip
Merge branch 'beheader' into 'master'
Beheader and Floyd See merge request legacy/serverdata!694
Diffstat (limited to 'world/map/npc')
-rw-r--r--world/map/npc/items/underworld_troll.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/world/map/npc/items/underworld_troll.txt b/world/map/npc/items/underworld_troll.txt
index afa22f6f..6a9d8740 100644
--- a/world/map/npc/items/underworld_troll.txt
+++ b/world/map/npc/items/underworld_troll.txt
@@ -1,6 +1,6 @@
function|script|UnderworldTroll
{
- if (getequipid(equip_hand1) != KidBook) goto L_Return;
+ if (getequipid(equip_hand1) != KidBook) && (getequipid(equip_hand1) != FloydBook) goto L_Return;
bonus bStr, 10;
bonus bAtkRange, 1;
goto L_Return;