diff options
| author | Led Mitz <smoothshifter@tuta.io> | 2023-08-03 20:36:17 +0000 |
|---|---|---|
| committer | Led Mitz <smoothshifter@tuta.io> | 2023-08-03 20:36:17 +0000 |
| commit | 60924744232eca2f836202196c614ce0db92080d (patch) | |
| tree | 15337ca7a0e0428f2803d0b99c88a51c40143877 | |
| parent | fd33cbf512e902259585791674dae85878737bc9 (diff) | |
| parent | e0c5a22af060ee342d8d5d02635af11cb62edfbf (diff) | |
| download | serverdata-60924744232eca2f836202196c614ce0db92080d.tar.gz serverdata-60924744232eca2f836202196c614ce0db92080d.tar.bz2 serverdata-60924744232eca2f836202196c614ce0db92080d.tar.xz serverdata-60924744232eca2f836202196c614ce0db92080d.zip | |
Merge branch 'new_delay_edits' into 'master'
Resubmitting delay edits
See merge request legacy/serverdata!674
| 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, 6 insertions, 12 deletions
diff --git a/client-data b/client-data -Subproject 922b0cb6c47f856d2af5dd07394b2981e39bed6 +Subproject 2505b2769205474ecb8f6aef05122ee2086760d diff --git a/tools b/tools -Subproject 0ceb76a855a53e08a5a841eb3f606c8a885e628 +Subproject ae849f6e931fe23125fbc5967ef862ff0248cd4 diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf index a61de176..f3ddf2fd 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, 1600; // @TMWA + //bonus bBaseWeaponDelayAdjust, 1150; // @TMWA "> }, { @@ -609,7 +609,6 @@ item_db: ( Script: <" bonus bDoubleAddRate, 5; bonus bHit, 3; - //bonus bBaseWeaponDelayAdjust, 25; // @TMWA "> }, { @@ -742,7 +741,6 @@ item_db: ( bonus bStr, 1; bonus bAspdRate, 1; bonus bHit, 5; - //bonus bBaseWeaponDelayAdjust, 25; // @TMWA "> }, { @@ -812,7 +810,6 @@ item_db: ( bonus bStr, 5; bonus bAspdRate, 2; bonus bHit, 5; - //bonus bBaseWeaponDelayAdjust, -50; // @TMWA "> }, { @@ -897,9 +894,6 @@ 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 17bbb847..540853ff 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, 1600;} +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;} 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; bonus bBaseWeaponDelayAdjust, 25;} +578, SandCutter, 4, 30000, 15000, 1500, 160, 0, 1, 0, 0, 2, 2, 0, 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} 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; bonus bBaseWeaponDelayAdjust, 25;} +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;} 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; bonus bBaseWeaponDelayAdjust, -50;} +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;} 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, {}, {bonus bBaseWeaponDelayAdjust, -150;} +623, Scythe, 4, 100, 50, 1200, 120, 5, 2, 0, 0, 2, 34, 0, 1, 23, 0, {}, {} 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;} |