summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHoraK-FDF <horak-fdf@web.de>2022-10-12 23:41:29 +0200
committerHoraK-FDF <horak-fdf@web.de>2022-10-12 23:41:29 +0200
commit35d053aee3ed000a16877f617370fd9bfd2c1979 (patch)
tree21c46d6f40364946407b9a876c83f9d46ede66a2
parent7bad0a737fa9b1d7c2fb8a41c0bad51bdd6e80cc (diff)
downloadserverdata-35d053aee3ed000a16877f617370fd9bfd2c1979.tar.gz
serverdata-35d053aee3ed000a16877f617370fd9bfd2c1979.tar.bz2
serverdata-35d053aee3ed000a16877f617370fd9bfd2c1979.tar.xz
serverdata-35d053aee3ed000a16877f617370fd9bfd2c1979.zip
item changes v2
Diffstat
-rw-r--r--world/map/db/item_db_head.txt14
-rw-r--r--world/map/db/item_db_trinket.txt10
-rw-r--r--world/map/npc/items/underworld_troll.txt14
-rw-r--r--world/map/npc/scripts.conf2
4 files changed, 28 insertions, 12 deletions
diff --git a/world/map/db/item_db_head.txt b/world/map/db/item_db_head.txt
index 37999b86..44929e44 100644
--- a/world/map/db/item_db_head.txt
+++ b/world/map/db/item_db_head.txt
@@ -40,11 +40,11 @@
725, GMCap, 5, 2000, 500, 20, 0, 5, 0, 5, 0, 2, 256, 0, 0, 0, {}, {callfunc "RestrictedItem";}
751, PinkieHat, 5, 5000, 1000, 5, 0, 1, 0, 1, 0, 2, 256, 0, 0, 0, {}, {}
752, FluffyHat, 5, 7000, 2000, 10, 0, 2, 0, -5, 0, 2, 256, 0, 0, 0, {}, {}
-759, PaladinsHelmet, 5, 0, 0, 500, 0, 19, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
-760, OverlordsHelmet, 5, 0, 0, 4000, 0, 50, 0, -60, 0, 2, 256, 0, 0, 0, {}, {}
-761, DesertHelmet, 5, 0, 0, 700, 0, 21, 0, -20, 0, 2, 256, 0, 0, 0, {}, {}
-764, SailorHat, 5, 0, 0, 20, 0, 5, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
-765, CaptainsHat, 5, 0, 0, 20, 0, 15, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
+759, PaladinsHelmet, 5, 0, 0, 500, 0, 19, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
+760, OverlordsHelmet, 5, 0, 0, 4000, 0, 50, 0, -60, 0, 2, 256, 0, 0, 0, {}, {bonus bSpeedAddRate, -5;}
+//761, DesertHelmet, 5, 0, 0, 0, 0, 21, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
+764, SailorHat, 5, 0, 0, 0, 0, 5, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
+765, CaptainsHat, 5, 0, 0, 0, 0, 15, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
766, TerraniteHelmet, 5, 30000, 3000, 300, 0, 15, 0, -12, 0, 2, 256, 0, 0, 0, {}, {bonus bMdef, 5;}
769, GuyFawkesMask, 5, 1000, 500, 50, 0, 3, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
770, FairyHat, 5, 2000, 1000, 20, 0, 5, 0, -10, 0, 2, 256, 0, 0, 0, {}, {bonus bLuk, 3;}
@@ -186,8 +186,8 @@
4033, ChefHat, 5, 1000, 500, 30, 0, 2, 0, 2, 0, 2, 256, 0, 0, 0, {}, {}
4042, RedNose, 5, 4000, 1000, 4, 0, 2, 0, 7, 0, 2, 256, 0, 0, 0, {}, {}
5128, DarkHelm, 5, 50000, 10000, 800, 0, 19, 0, -80, 0, 2, 256, 0, 0, 0, {}, {bonus bMaxHPrate, 10; bonus bInt, -Int;}
-5129, UnderworldMask, 5, 50000, 10000, 100, 0, 5, 0, 0, 0, 2, 256, 0, 0, 0, {}, {bonus bAtkRange, 2; bonus bInt, -Int; bonus bAgi, 3; bonus bDex, 3;}
-5130, Phylactery, 5, 50000, 10000, 20, 0, 1, 0, 5, 0, 2, 256, 0, 0, 0, {}, {bonus bAspdRate, 25; bonus bDex, -(Dex/4);}
+5129, UnderworldMask, 5, 50000, 10000, 100, 0, 5, 0, 0, 0, 2, 256, 0, 0, 0, {}, {bonus bAtkRange, 2; bonus bInt, -Int; bonus bAgi, 2; bonus bDex, 2; callfunc "UnderworldTroll";}
+5130, Phylactery, 5, 50000, 10000, 20, 0, 1, 0, 5, 0, 2, 256, 0, 0, 0, {}, {bonus bAspdRate, 25;}
5200, PointyWitchHat, 5, 1000, 500, 50, 0, 3, 0, 0, 0, 2, 256, 0, 0, 0, {}, {}
5201, Pipe, 5, 5000, 2500, 20, 0, 2, 0, 0, 0, 2, 256, 0, 18, 0, {}, {bonus bDex, 1; bonus bLuk, 1; bonus bCritical, 10;callfunc "DrugItem";}
5202, PilotHat, 5, 2500, 1250, 30, 0, 10, 0, 2, 0, 2, 256, 0, 0, 0, {}, {}
diff --git a/world/map/db/item_db_trinket.txt b/world/map/db/item_db_trinket.txt
index d6677fc7..3fe75e29 100644
--- a/world/map/db/item_db_trinket.txt
+++ b/world/map/db/item_db_trinket.txt
@@ -3,10 +3,10 @@
702, WeddingRing, 5, 1000, 1, 1, 0, 0, 0, 0, 0, 2, 16, 0, 0, 0, {}, {}
742, FourLeafClover, 5, 10000, 5000, 1, 0, 0, 0, 5, 0, 2, 8, 0, 0, 0, {}, {bonus bLuk, 1;}
749, Towel, 5, 800, 250, 50, 0, 0, 0, 5, 0, 2, 8, 0, 0, 0, {}, {}
-829, CrozeniteFourLeafAmulet, 5, 10000, 1000, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, {bonus bLuk, 1;}
-830, BromenalFourLeafAmulet, 5, 20000, 2000, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, {bonus bLuk, 2;}
-831, SilverFourLeafAmulet, 5, 30000, 3000, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, {bonus bLuk, 3;}
-832, GoldenFourLeafAmulet, 5, 40000, 4000, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, {bonus bLuk, 4;}
+//829, CrozeniteFourLeafAmulet, 5, 10000, 1000, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, {bonus bLuk, 1;}
+//830, BromenalFourLeafAmulet, 5, 20000, 2000, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, {bonus bLuk, 2;}
+//831, SilverFourLeafAmulet, 5, 30000, 3000, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, {bonus bLuk, 3;}
+//832, GoldenFourLeafAmulet, 5, 40000, 4000, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, {bonus bLuk, 4;}
865, Grimoire, 5, 5000, 2500, 100, 0, 0, 0, 5, 0, 2, 8, 0, 0, 0, {}, {bonus bMaxSP, 30;}
879, HeartOfIsis, 5, 70000, 35000, 40, 0, 0, 0, 0, 0, 2, 8, 0, 85, 0, {}, {bonus bMaxHPrate, 15; bonus bHPrecovRate, 65;}
1227, EnchantersAmulet, 5, 0, 0, 1, 0, 0, 0, 0, 0, 2, 16, 0, 0, 0, {}, {bonus bHit, 22;}
@@ -18,7 +18,7 @@
4012, TopazRing, 5, 5000, 2500, 1, 0, 0, 0, 0, 0, 2, 128, 0, 0, 0, {}, {bonus bAgi, 1;}
4013, AmethystRing, 5, 5000, 2500, 1, 0, 0, 0, 0, 0, 2, 128, 0, 0, 0, {}, {bonus bDex, 1;}
4014, SimpleRing, 5, 100000, 2500, 1, 0, 0, 0, 0, 0, 2, 128, 0, 0, 0, {}, {}
-677, HeartNecklace, 5, 2500, 0, 10, 0, 0, 0, 0, 0, 2, 8, 0, 0, 0, {}, {bonus bMaxHP, 50; bonus bHPrecovRate, 25;}
+677, HeartNecklace, 5, 2500, 0, 10, 0, 0, 0, 0, 0, 2, 8, 0, 60, 0, {}, {bonus bMaxHP, 50; bonus bHPrecovRate, 25;}
5252, GuardianWings, 5, 0, 0, 1, 0, 0, 0, 0, 0, 2, 16, 0, 0, 0, {}, {}
5253, MageRing, 5, 0, 0, 1, 0, 0, 0, 0, 0, 2, 128, 0, 0, 0, {}, {bonus bInt, 1;}
//5268, AssassinRing, 5, 0, 0, 1, 0, 0, 0, 0, 0, 2, 128, 0, 0, 0, {}, {callfunc "BrawlingItem"; bonus bAgi, 1; bonus bCritical, 5; bonus bAspdRate, 5;}
diff --git a/world/map/npc/items/underworld_troll.txt b/world/map/npc/items/underworld_troll.txt
new file mode 100644
index 00000000..b59e544e
--- /dev/null
+++ b/world/map/npc/items/underworld_troll.txt
@@ -0,0 +1,14 @@
+// Items which can only be used while unarmed
+// Variables passed to this script:
+// @slotId The slot in which the item would have been equipped in. This is passed automagically when called in an equip script.
+
+function|script|UnderworldTroll
+{
+ if (getequipid(equip_hand1) != 906) goto L_Return; // Kid Book
+ bonus bStr, 2;
+ bonus bAtkRange, 1;
+ goto L_Return;
+
+L_Return:
+ return;
+}
diff --git a/world/map/npc/scripts.conf b/world/map/npc/scripts.conf
index 86c7c75f..aee25e75 100644
--- a/world/map/npc/scripts.conf
+++ b/world/map/npc/scripts.conf
@@ -56,6 +56,8 @@ npc: npc/items/max_stat.txt
npc: npc/items/nobow_item.txt
npc: npc/items/love_potion.txt
npc: npc/items/manapearl_item.txt
+npc: npc/items/underworld_troll.txt
+
import: npc/_import.txt
// magic
generated by cgit v1.2.3-60-g2f50 (git 2.42.0) at 2024-05-19 00:10:37 +0000