From 68ddab433cbd6279eba69b276868be42b11de935 Mon Sep 17 00:00:00 2001 From: Led Mitz Date: Thu, 11 Apr 2024 13:45:58 +0000 Subject: Flintlock, not Revolver or Gunstaff Changed name in items to from Revolver to Flintlock. **** --- client-data | 2 +- world/map/db/const-aegis.txt | 2 +- world/map/db/item_db.conf | 4 ++-- world/map/db/item_db_weapon.txt | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/client-data b/client-data index cba29343..b9f70100 160000 --- a/client-data +++ b/client-data @@ -1 +1 @@ -Subproject commit cba293438f59443429b6cb69fad882070c3485fe +Subproject commit b9f70100f6f3ccbfac62793ea406d958b3b6fc8e diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt index ea4996c1..8d550ca2 100644 --- a/world/map/db/const-aegis.txt +++ b/world/map/db/const-aegis.txt @@ -52,7 +52,7 @@ ArmorBreaker 5289 SilverArrow 5290 ThornArrow 5291 SnowLauncher 5261 -Revolver 5284 +Flintlock 5284 WeddingRing 702 FourLeafClover 742 Towel 749 diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf index 9cbdc1e3..b4168e85 100644 --- a/world/map/db/item_db.conf +++ b/world/map/db/item_db.conf @@ -1357,8 +1357,8 @@ item_db: ( }, { Id: 5284 - AegisName: "Revolver" - Name: "Revolver" + AegisName: "Flintlock" + Name: "Flintlock Pistol" Type: "IT_WEAPON" Buy: 150000 Sell: 500 diff --git a/world/map/db/item_db_weapon.txt b/world/map/db/item_db_weapon.txt index c6f99cda..4c61e1cc 100644 --- a/world/map/db/item_db_weapon.txt +++ b/world/map/db/item_db_weapon.txt @@ -56,7 +56,7 @@ 1282, BoneArrows, 10, 50, 20, 0, 55, 0, 0, 0, 0, 2, 32768, 0, 0, 0, 0, {}, {bonus bCritical, 1; set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";} 5260, Snowball, 10, 1, 0, 1, 20, 0, 0, 0, 0, 2, 32768, 0, 0, 0, 0, {}, {set @AmmoType, AMMO_XMAS; callfunc "CheckAmmo";} 5261, SnowLauncher, 4, 500, 50, 10, 20, 0, 3, 0, 0, 2, 2, 1, 1, 11, 0, {}, {set @LauncherType, AMMO_XMAS; callfunc "CheckLauncher";} -5284, Revolver, 4, 150000, 500, 3000, 120, 0, 5, 0, 0, 2, 2, 1, 1, 11, 0, {}, {callfunc "RestrictedItem"; set @LauncherType, AMMO_SLING; callfunc "CheckLauncher";} +5284, Flintlock, 4, 150000, 500, 3000, 120, 0, 5, 0, 0, 2, 2, 1, 1, 11, 0, {}, {callfunc "RestrictedItem"; set @LauncherType, AMMO_SLING; callfunc "CheckLauncher";} 5289, ArmorBreaker, 10, 90, 40, 2, -120, 0, 0, 0, 0, 2, 32768, 0, 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, 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, 0, {}, {bonus bCritical, 10; bonus bHit, 25; set @AmmoType, AMMO_BOW; callfunc "CheckAmmo";} -- cgit v1.2.3-60-g2f50