diff options
| author | Jesusaves <cpntb1@ymail.com> | 2022-11-20 15:28:37 -0300 |
|---|---|---|
| committer | Jesusaves <cpntb1@ymail.com> | 2022-11-20 15:28:37 -0300 |
| commit | 144a6acdbf1a7986f0dee1ec7da1679eaa9af18a (patch) | |
| tree | 54899cd956c7689012dfd77d35c74d9d34d3e325 | |
| parent | f70e1f1a7c7d676c2ca758db5371bda67e89d974 (diff) | |
| download | serverdata-144a6acdbf1a7986f0dee1ec7da1679eaa9af18a.tar.gz serverdata-144a6acdbf1a7986f0dee1ec7da1679eaa9af18a.tar.bz2 serverdata-144a6acdbf1a7986f0dee1ec7da1679eaa9af18a.tar.xz serverdata-144a6acdbf1a7986f0dee1ec7da1679eaa9af18a.zip | |
Fix overlap reported by Evolvedstable
| -rw-r--r-- | world/map/db/item_db.conf | 4 | ||||
| -rw-r--r-- | world/map/db/item_db_weapon.txt | 9 |
2 files changed, 6 insertions, 7 deletions
diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf index 2b3e7565..50d7251b 100644 --- a/world/map/db/item_db.conf +++ b/world/map/db/item_db.conf @@ -1484,7 +1484,7 @@ item_db: ( "> }, { - Id: 5269 + Id: 5270 AegisName: "ManaPearl" Name: "Mana Pearl" Type: "IT_ARMOR" @@ -15144,7 +15144,7 @@ item_db: ( // Not Yet Implemented { - Id: 589 + Id: 590 AegisName: "DragonSword" Name: "Dragon Sword" }, diff --git a/world/map/db/item_db_weapon.txt b/world/map/db/item_db_weapon.txt index a0bb33e9..a8e58fd9 100644 --- a/world/map/db/item_db_weapon.txt +++ b/world/map/db/item_db_weapon.txt @@ -29,8 +29,7 @@ 584, Jackal, 4, 8000, 4000, 1000, 125, 2, 1, 0, 0, 2, 2, 1, 90, 10, {}, {bonus bMaxHP, 50; bonus2 bHPDrainRate, 100, 5; bonus bCriticalDef, 2; bonus bStr, 1; bonus bAspdRate, 1; bonus bHit, 5;} 587, Sword, 4, 1000, 500, 200, 15, 0, 1, 0, 0, 2, 2, 1, 1, 1, {}, {callfunc "UnreleasedItem";} 588, BastardSword, 4, 1000, 500, 200, 15, 0, 1, 0, 0, 2, 2, 1, 1, 1, {}, {callfunc "UnreleasedItem";} -589, DragonSword, 4, 8000, 4000, 1000, 141, -2, 1, 0, 0, 2, 2, 1, 90, 3, {}, {bonus bMaxHP, -100; bonus2 bHPDrainRate, 100, -1; bonus bCriticalDef, -2; bonus bStr, 5; bonus bAspdRate, 2; bonus bHit, 5;} -//590, RESERVED, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} +590, DragonSword, 4, 8000, 4000, 1000, 141, -2, 1, 0, 0, 2, 2, 1, 90, 3, {}, {bonus bMaxHP, -100; bonus2 bHPDrainRate, 100, -1; bonus bCriticalDef, -2; bonus bStr, 5; bonus bAspdRate, 2; bonus bHit, 5;} 591, LongSword, 4, 1000, 500, 200, 15, 0, 1, 0, 0, 2, 2, 1, 1, 1, {}, {callfunc "UnreleasedItem";} //592, RESERVED, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} //593, RESERVED, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} @@ -45,7 +44,7 @@ //606, RESERVED, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} //607, RESERVED, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} //608, RESERVED, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, {}, {} -609, ImperialBow, 4, 101000, 40000, 900, 110, 0, 6, 0, 0, 2, 34, 1, 90, 11, {}, {set @bStat, Dex;set @minbStatVal, 80;callfunc "RequireStat"; bonus2 bHPDrainRate, 100, 2; bonus bCriticalDef, 10; bonus bFlee, 10; set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";} +609, ImperialBow, 4, 101000, 40000, 900, 110, 0, 6, 0, 0, 2, 34, 1, 90, 11, {}, {set @bStat, Dex;set @minbStatVal, 80;callfunc "RequireStat"; bonus2 bHPDrainRate, 100, 4; bonus bCriticalDef, 10; bonus bFlee, 10; bonus bAspdRate, 1; set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";} 623, Scythe, 4, 100, 50, 1200, 75, 0, 1, 0, 0, 2, 34, 1, 1, 3, {}, {} 758, WoodenStaff, 4, 4000, 2000, 1000, 50, 0, 1, 10, 0, 2, 34, 1, 1, 10, {}, {set @bStat, Int;set @minbStatVal, 60;callfunc "RequireStat";} //ID, Name___________________, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, {UseScript}, {EquipScript} @@ -67,7 +66,7 @@ 5261, SnowLauncher, 4, 500, 50, 10, 20, 0, 3, 0, 0, 2, 2, 1, 1, 11, {}, {set @LauncherType, AMMO_XMAS; callfunc "CheckLauncher";} 5284, Revolver, 4, 1500000, 500000, 3000, 120, 0, 5, 0, 0, 2, 2, 1, 1, 11, {}, {set @LauncherType, AMMO_SLING; callfunc "CheckLauncher"; set @minLvl, 1;callfunc "RestrictedItem";} -5289, ArmorBreaker, 10, 90, 40, 2, -120, 0, 0, 0, 0, 2, 32768, 0, 0, 0, {}, {bonus bCritical, 50; set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";} +5289, ArmorBreaker, 10, 90, 40, 2, -120, 0, 0, 0, 0, 2, 32768, 0, 0, 0, {}, {bonus bCritical, 75; set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";} 5290, SilverArrow, 10, 60, 30, 1, 65, 0, 0, 0, 0, 2, 32768, 0, 0, 0, {}, {bonus bCritical, 1; bonus bAtkRange, 2; set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";} -5291, ThornArrow, 10, 90, 40, 1, 65, 0, 0, 0, 0, 2, 32768, 0, 0, 0, {}, {bonus bCritical, 7; bonus bHit, 15; set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";} +5291, ThornArrow, 10, 90, 40, 1, 65, 0, 0, 0, 0, 2, 32768, 0, 0, 0, {}, {bonus bCritical, 10; bonus bHit, 25; set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";} |