diff options
| author | Ledmitz <smoothshifter@tuta.io> | 2024-04-11 10:17:59 -0300 |
|---|---|---|
| committer | Led Mitz <smoothshifter@tuta.io> | 2024-04-12 06:40:29 +0000 |
| commit | 07ab3eebe6e0521d554ed889e785f8a46c4ac0fb (patch) | |
| tree | 3ad066182ca8c34482c37aea8ece5bcc4b6b648a | |
| parent | 9395e84b3498cd6f60c96434b9e4c02f697d2981 (diff) | |
| download | serverdata-07ab3eebe6e0521d554ed889e785f8a46c4ac0fb.tar.gz serverdata-07ab3eebe6e0521d554ed889e785f8a46c4ac0fb.tar.bz2 serverdata-07ab3eebe6e0521d554ed889e785f8a46c4ac0fb.tar.xz serverdata-07ab3eebe6e0521d554ed889e785f8a46c4ac0fb.zip | |
Revert "Flintlock - server"
This reverts commit 9d40ee0c0cf6c39014a0703b554ae2e48a8ee9ef.
(cherry picked from commit 2ea0a331a277941fb1d67466b0719f79f7813fa7)
| m--------- | client-data | 0 | ||||
| -rw-r--r-- | world/map/db/const-aegis.txt | 2 | ||||
| -rw-r--r-- | world/map/db/item_db.conf | 4 | ||||
| -rw-r--r-- | world/map/db/item_db_weapon.txt | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/client-data b/client-data -Subproject b9f70100f6f3ccbfac62793ea406d958b3b6fc8 +Subproject cba293438f59443429b6cb69fad882070c3485f diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt index 8d550ca2..ea4996c1 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 -Flintlock 5284 +Revolver 5284 WeddingRing 702 FourLeafClover 742 Towel 749 diff --git a/world/map/db/item_db.conf b/world/map/db/item_db.conf index b4168e85..9cbdc1e3 100644 --- a/world/map/db/item_db.conf +++ b/world/map/db/item_db.conf @@ -1357,8 +1357,8 @@ item_db: ( }, { Id: 5284 - AegisName: "Flintlock" - Name: "Flintlock Pistol" + AegisName: "Revolver" + Name: "Revolver" 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 4c61e1cc..c6f99cda 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, Flintlock, 4, 150000, 500, 3000, 120, 0, 5, 0, 0, 2, 2, 1, 1, 11, 0, {}, {callfunc "RestrictedItem"; set @LauncherType, AMMO_SLING; 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";} 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";} |