summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--world/map/db/item_db.conf1
-rw-r--r--world/map/db/item_db_weapon.txt2
-rw-r--r--world/map/npc/items/underworld_troll.txt2
3 files changed, 2 insertions, 3 deletions
diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf
index 9ee50411..494e7789 100644
--- a/world/map/db/item_db.conf
+++ b/world/map/db/item_db.conf
@@ -562,7 +562,6 @@ item_db: (
">
Script: <"
bonus bDoubleAddRate, 50;
- bonus bSpeedAddRate, 10;
bonus bHit, -20;
bonus bCritical, -25;
//bonus bBaseWeaponDelayAdjust, 1150; // @TMWA
diff --git a/world/map/db/item_db_weapon.txt b/world/map/db/item_db_weapon.txt
index 2470204b..be6e511e 100644
--- a/world/map/db/item_db_weapon.txt
+++ b/world/map/db/item_db_weapon.txt
@@ -19,7 +19,7 @@
573, Falchion, 4, 8000, 4000, 900, 270, 0, 1, 0, 0, 2, 2, 1, 1, 2, 0, {}, {callfunc "UnreleasedItem"; bonus bDoubleAddRate, 40; bonus bHit, -25; bonus bCritical, -25;}
574, ScorpionKing, 4, 8000, 4000, 600, 120, 0, 1, 0, 0, 2, 2, 1, 1, 4, 0, {}, {callfunc "UnreleasedItem";}
575, DesertBow, 4, 8000, 4000, 1200, 85, 0, 7, -10, 0, 2, 34, 1, 1, 11, 0, {}, {callfunc "UnreleasedItem"; set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";}
-576, Beheader, 4, 8000, 4000, 2000, 999, 0, 1, 0, 0, 2, 2, 1, 1, 2, 0, {}, {callfunc "NoBowItem"; set @bStat, Int; set @maxbStatVal, 1; callfunc "RequireMaxStat"; bonus bDoubleAddRate, 50; bonus bSpeedAddRate, 10; bonus bHit, -20; bonus bCritical, -25; bonus bBaseWeaponDelayAdjust, 1150;}
+576, Beheader, 4, 8000, 4000, 2000, 999, 0, 1, 0, 0, 2, 2, 1, 1, 2, 0, {}, {callfunc "NoBowItem"; set @bStat, Int; set @maxbStatVal, 1; callfunc "RequireMaxStat"; bonus bDoubleAddRate, 50; bonus bHit, -20; bonus bCritical, -25; bonus bBaseWeaponDelayAdjust, 1150;}
577, BoneDarts, 4, 8000, 4000, 300, 100, 0, 3, 0, 0, 2, 2, 1, 1, 22, 0, {}, {callfunc "UnreleasedItem";}
578, SandCutter, 4, 30000, 15000, 1500, 160, 0, 1, 0, 0, 2, 2, 2, 80, 2, 0, {}, {bonus bDoubleAddRate, 5; bonus bHit, 3;}
//ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript}
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;