diff options
| author | Led Mitz <smoothshifter@tuta.io> | 2023-08-03 20:14:06 +0000 |
|---|---|---|
| committer | Led Mitz <smoothshifter@tuta.io> | 2023-08-03 20:14:06 +0000 |
| commit | fd33cbf512e902259585791674dae85878737bc9 (patch) | |
| tree | 1a01e402edf5b1e945f7d1a25b491f8c284de5ce | |
| parent | 8698e2db6a08d92e954c67afb7990fda113b1431 (diff) | |
| parent | a227310b4afd0bfc01c3ab290938482cacbf07e1 (diff) | |
| download | serverdata-fd33cbf512e902259585791674dae85878737bc9.tar.gz serverdata-fd33cbf512e902259585791674dae85878737bc9.tar.bz2 serverdata-fd33cbf512e902259585791674dae85878737bc9.tar.xz serverdata-fd33cbf512e902259585791674dae85878737bc9.zip | |
Merge branch 'revert-a165b1fe' into 'master'
Revert "Altered a few delays"
See merge request legacy/serverdata!673
| m--------- | client-data | 0 | ||||
| m--------- | tools | 0 | ||||
| -rw-r--r-- | world/map/db/item_db.conf | 8 | ||||
| -rw-r--r-- | world/map/db/item_db_weapon.txt | 10 |
4 files changed, 12 insertions, 6 deletions
diff --git a/client-data b/client-data -Subproject 2505b2769205474ecb8f6aef05122ee2086760d +Subproject 922b0cb6c47f856d2af5dd07394b2981e39bed6 diff --git a/tools b/tools -Subproject ae849f6e931fe23125fbc5967ef862ff0248cd4 +Subproject 0ceb76a855a53e08a5a841eb3f606c8a885e628 diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf index f3ddf2fd..a61de176 100644 --- a/world/map/db/item_db.conf +++ b/world/map/db/item_db.conf @@ -565,7 +565,7 @@ item_db: ( bonus bSpeedAddRate, 10; bonus bHit, -20; bonus bCritical, -25; - //bonus bBaseWeaponDelayAdjust, 1150; // @TMWA + //bonus bBaseWeaponDelayAdjust, 1600; // @TMWA "> }, { @@ -609,6 +609,7 @@ item_db: ( Script: <" bonus bDoubleAddRate, 5; bonus bHit, 3; + //bonus bBaseWeaponDelayAdjust, 25; // @TMWA "> }, { @@ -741,6 +742,7 @@ item_db: ( bonus bStr, 1; bonus bAspdRate, 1; bonus bHit, 5; + //bonus bBaseWeaponDelayAdjust, 25; // @TMWA "> }, { @@ -810,6 +812,7 @@ item_db: ( bonus bStr, 5; bonus bAspdRate, 2; bonus bHit, 5; + //bonus bBaseWeaponDelayAdjust, -50; // @TMWA "> }, { @@ -894,6 +897,9 @@ item_db: ( Refine: false ViewSprite: 1 Subtype: "W_2HSTAFF" + Script: <" + //bonus bBaseWeaponDelayAdjust, -150; // @TMWA + "> }, { Id: 758 diff --git a/world/map/db/item_db_weapon.txt b/world/map/db/item_db_weapon.txt index 540853ff..17bbb847 100644 --- a/world/map/db/item_db_weapon.txt +++ b/world/map/db/item_db_weapon.txt @@ -19,24 +19,24 @@ 573, Falchion, 4, 8000, 4000, 900, 270, 0, 1, 0, 0, 2, 2, 0, 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, 0, 1, 4, 0, {}, {callfunc "UnreleasedItem";} 575, DesertBow, 4, 8000, 4000, 1200, 85, 0, 7, -10, 0, 2, 34, 0, 1, 11, 0, {}, {callfunc "UnreleasedItem"; set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";} -576, Beheader, 4, 8000, 4000, 2000, 999, 0, 1, 0, 0, 2, 2, 0, 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, 0, 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, 1600;} 577, BoneDarts, 4, 8000, 4000, 300, 100, 0, 3, 0, 0, 2, 2, 0, 1, 22, 0, {}, {callfunc "UnreleasedItem";} -578, SandCutter, 4, 30000, 15000, 1500, 160, 0, 1, 0, 0, 2, 2, 0, 80, 2, 0, {}, {bonus bDoubleAddRate, 5; bonus bHit, 3;} +578, SandCutter, 4, 30000, 15000, 1500, 160, 0, 1, 0, 0, 2, 2, 0, 80, 2, 0, {}, {bonus bDoubleAddRate, 5; bonus bHit, 3; bonus bBaseWeaponDelayAdjust, 25;} //ID, Name, Type, Price, Sell, Weight, ATK, DEF, Range, Mbonus, Slot, Gender, Loc, wLV, eLV, View, Mode, {UseScript}, {EquipScript} 579, RockKnife, 4, 15000, 7500, 500, 110, 0, 1, 0, 0, 2, 2, 0, 1, 1, 0, {}, {bonus bVit, 3;} 580, StaffOfLife, 4, 8000, 4000, 1500, 100, 0, 1, 0, 0, 2, 2, 0, 1, 10, 0, {}, {callfunc "UnreleasedItem";} 581, CrescentRod, 4, 8000, 4000, 1500, 100, 0, 1, 0, 0, 2, 2, 0, 1, 10, 0, {}, {callfunc "UnreleasedItem";} 582, StaffOfFire, 4, 8000, 4000, 1500, 100, 0, 1, 0, 0, 2, 2, 0, 1, 10, 0, {}, {callfunc "UnreleasedItem";} 583, StaffOfIce, 4, 8000, 4000, 1500, 100, 0, 1, 0, 0, 2, 2, 0, 1, 10, 0, {}, {callfunc "UnreleasedItem";} -584, Jackal, 4, 8000, 4000, 1500, 150, 5, 1, 0, 0, 2, 2, 0, 1, 2, 0, {}, {bonus bMaxHP, 50; bonus2 bHPDrainRate, 100, 5; bonus bCriticalDef, 2; bonus bStr, 1; bonus bAspdRate, 1; bonus bHit, 5;} +584, Jackal, 4, 8000, 4000, 1500, 150, 5, 1, 0, 0, 2, 2, 0, 1, 2, 0, {}, {bonus bMaxHP, 50; bonus2 bHPDrainRate, 100, 5; bonus bCriticalDef, 2; bonus bStr, 1; bonus bAspdRate, 1; bonus bHit, 5; bonus bBaseWeaponDelayAdjust, 25;} 587, Sword, 4, 1000, 500, 1500, 140, 0, 1, 0, 0, 2, 2, 0, 1, 2, 0, {}, {callfunc "UnreleasedItem";} 588, BastardSword, 4, 1000, 500, 1500, 150, 0, 1, 0, 0, 2, 2, 0, 1, 2, 0, {}, {callfunc "UnreleasedItem";} -590, DragonSword, 4, 8000, 4000, 1050, 161, -2, 1, 0, 0, 2, 2, 0, 1, 2, 0, {}, {bonus bMaxHP, -100; bonus2 bHPDrainRate, 100, -1; bonus bCriticalDef, -2; bonus bStr, 5; bonus bAspdRate, 2; bonus bHit, 5;} +590, DragonSword, 4, 8000, 4000, 1050, 161, -2, 1, 0, 0, 2, 2, 0, 1, 2, 0, {}, {bonus bMaxHP, -100; bonus2 bHPDrainRate, 100, -1; bonus bCriticalDef, -2; bonus bStr, 5; bonus bAspdRate, 2; bonus bHit, 5; bonus bBaseWeaponDelayAdjust, -50;} 591, LongSword, 4, 1000, 500, 1300, 150, 0, 1, 0, 0, 2, 2, 0, 1, 2, 0, {}, {callfunc "UnreleasedItem";} 594, Spear, 4, 1000, 500, 200, 110, 0, 1, 0, 0, 2, 2, 0, 1, 4, 0, {}, {callfunc "UnreleasedItem";} 596, Pike, 4, 20, 10, 3000, 170, 8, 2, 0, 0, 2, 34, 0, 0, 5, 0, {}, {callfunc "UnreleasedItem";} 609, ImperialBow, 4, 101000, 40000, 900, 110, 0, 6, -9, 0, 2, 34, 0, 90, 11, 0, {}, {set @bStat, Dex; set @minbStatVal, 80; callfunc "RequireStat"; bonus2 bHPDrainRate, 100, 4; bonus bCriticalDef, 10; bonus bFlee, 10; bonus bAspdRate, 10; set @LauncherType, AMMO_BOW; callfunc "CheckLauncher";} -623, Scythe, 4, 100, 50, 1200, 120, 5, 2, 0, 0, 2, 34, 0, 1, 23, 0, {}, {} +623, Scythe, 4, 100, 50, 1200, 120, 5, 2, 0, 0, 2, 34, 0, 1, 23, 0, {}, {bonus bBaseWeaponDelayAdjust, -150;} 758, WoodenStaff, 4, 4000, 2000, 800, 50, 3, 2, 10, 0, 2, 34, 0, 1, 23, 0, {}, {set @bStat, Int; set @minbStatVal, 60; callfunc "RequireStat";} 762, TerraniteArrow, 10, 80, 20, 1, 50, 0, 0, 0, 0, 2, 32768, 0, 0, 0, 0, {}, {bonus bCritical, 20; set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";} 867, IceGladius, 4, 2000, 1000, 1000, 130, 0, 1, 0, 0, 2, 2, 0, 1, 2, 0, {}, {bonus bLuk, 1;} |