summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLedmitz <smoothshifter@tuta.io>2024-04-11 10:17:59 -0300
committerLedmitz <smoothshifter@tuta.io>2024-04-12 13:17:08 -0300
commit003b99f139c13388825cdebaa33c32ba551d3894 (patch)
tree948db9c8dbccbedf24683faf2a227a1a4637db75
parentfa2bb42c2e56aaa315bc9c85ce6dd369754831ec (diff)
downloadserverdata-003b99f139c13388825cdebaa33c32ba551d3894.tar.gz
serverdata-003b99f139c13388825cdebaa33c32ba551d3894.tar.bz2
serverdata-003b99f139c13388825cdebaa33c32ba551d3894.tar.xz
serverdata-003b99f139c13388825cdebaa33c32ba551d3894.zip
Revert "Flintlock - server"
This reverts commit 9d40ee0c0cf6c39014a0703b554ae2e48a8ee9ef.
m---------client-data0
-rw-r--r--world/map/db/const-aegis.txt2
-rw-r--r--world/map/db/item_db_weapon.txt2
3 files changed, 2 insertions, 2 deletions
diff --git a/client-data b/client-data
-Subproject 538b72382c76f172ef6e7cf019384ec764e8655
+Subproject 25597511964c733540f456b209a8d00963199d8
diff --git a/world/map/db/const-aegis.txt b/world/map/db/const-aegis.txt
index b593f7fb..ccf7181c 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_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";}