summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLed Mitz <smoothshifter@tuta.io>2023-04-14 17:56:10 +0000
committerLed Mitz <smoothshifter@tuta.io>2023-04-14 17:56:10 +0000
commit4bac24c0b19d40d3d39e9e32a5ef603c4f126e60 (patch)
tree74b2fa4e29b28009e9e94d462431e5ac7907bea3
parente51854e90c4307e34a6c86f794ae0805436eb875 (diff)
parent5e632c2d7ccf19c54f1601cc2243fe54bfc5c839 (diff)
downloadserverdata-4bac24c0b19d40d3d39e9e32a5ef603c4f126e60.tar.gz
serverdata-4bac24c0b19d40d3d39e9e32a5ef603c4f126e60.tar.bz2
serverdata-4bac24c0b19d40d3d39e9e32a5ef603c4f126e60.tar.xz
serverdata-4bac24c0b19d40d3d39e9e32a5ef603c4f126e60.zip
Merge branch 'clover_amulets' into 'master'
Clover amulets 2 amulet slot See merge request legacy/serverdata!641
-rw-r--r--world/map/db/item_db.conf8
-rw-r--r--world/map/db/item_db_trinket.txt8
2 files changed, 8 insertions, 8 deletions
diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf
index afee67aa..3bc6812d 100644
--- a/world/map/db/item_db.conf
+++ b/world/map/db/item_db.conf
@@ -1434,7 +1434,7 @@ item_db: (
Matk: 5
Def: 0
Slots: 0
- Loc: "EQP_ACC_L"
+ Loc: "EQP_ARMOR"
Refine: false
ViewSprite: 829
Script: <"
@@ -1453,7 +1453,7 @@ item_db: (
Matk: 5
Def: 0
Slots: 0
- Loc: "EQP_ACC_L"
+ Loc: "EQP_ARMOR"
Refine: false
ViewSprite: 830
Script: <"
@@ -1472,7 +1472,7 @@ item_db: (
Matk: 5
Def: 0
Slots: 0
- Loc: "EQP_ACC_L"
+ Loc: "EQP_ARMOR"
Refine: false
ViewSprite: 831
Script: <"
@@ -1491,7 +1491,7 @@ item_db: (
Matk: 5
Def: 0
Slots: 0
- Loc: "EQP_ACC_L"
+ Loc: "EQP_ARMOR"
Refine: false
ViewSprite: 832
Script: <"
diff --git a/world/map/db/item_db_trinket.txt b/world/map/db/item_db_trinket.txt
index e67a0aa3..0504294d 100644
--- a/world/map/db/item_db_trinket.txt
+++ b/world/map/db/item_db_trinket.txt
@@ -6,10 +6,10 @@
702, WeddingRing, 5, 1000, 1, 1, 0, 0, 0, 0, 0, 2, 16, 0, 0, 0, 0, {}, {}
742, FourLeafClover, 5, 10000, 5000, 1, 0, 0, 0, 5, 0, 2, 8, 0, 0, 0, 0, {}, {bonus bLuk, 1;}
749, Towel, 5, 800, 250, 50, 0, 0, 0, 5, 0, 2, 8, 0, 0, 0, 0, {}, {}
-829, CrozeniteFourLeafAmulet,5, 10000, 1000, 10, 0, 0, 0, 5, 0, 2, 8, 0, 0, 0, 0, {}, {bonus bLuk, 1;}
-830, BromenalFourLeafAmulet, 5, 20000, 2000, 10, 0, 0, 0, 5, 0, 2, 8, 0, 0, 0, 0, {}, {bonus bLuk, 2;}
-831, SilverFourLeafAmulet, 5, 30000, 3000, 10, 0, 0, 0, 5, 0, 2, 8, 0, 0, 0, 0, {}, {bonus bLuk, 3;}
-832, GoldenFourLeafAmulet, 5, 40000, 4000, 10, 0, 0, 0, 5, 0, 2, 8, 0, 0, 0, 0, {}, {bonus bLuk, 4;}
+829, CrozeniteFourLeafAmulet,5, 10000, 1000, 10, 0, 0, 0, 5, 0, 2, 16, 0, 0, 0, 0, {}, {bonus bLuk, 1;}
+830, BromenalFourLeafAmulet, 5, 20000, 2000, 10, 0, 0, 0, 5, 0, 2, 16, 0, 0, 0, 0, {}, {bonus bLuk, 2;}
+831, SilverFourLeafAmulet, 5, 30000, 3000, 10, 0, 0, 0, 5, 0, 2, 16, 0, 0, 0, 0, {}, {bonus bLuk, 3;}
+832, GoldenFourLeafAmulet, 5, 40000, 4000, 10, 0, 0, 0, 5, 0, 2, 16, 0, 0, 0, 0, {}, {bonus bLuk, 4;}
865, Grimoire, 5, 5000, 2500, 100, 0, 0, 0, 5, 0, 2, 8, 0, 0, 0, 0, {}, {bonus bMaxSP, 30;}
879, HeartOfIsis, 5, 70000, 35000, 40, 0, 0, 0, 0, 0, 2, 8, 0, 85, 0, 0, {}, {bonus bMaxHPrate, 15; bonus bHPrecovRate, 60;}
1227, EnchantersAmulet, 5, 1000, 1, 1, 0, 0, 0, 0, 0, 2, 16, 0, 0, 0, 0, {}, {bonus bHit, 22;}