From 7a97100509ae2eee4adbd61f86e6f837d2acdada Mon Sep 17 00:00:00 2001
From: ErikasKontenis <e.kontenis@gmail.com>
Date: Wed, 14 Apr 2021 22:52:04 +0300
Subject: [PATCH] fishing rod does not require worms. Increase ring of healing
 and life ring values. Balance vocation regeneration.

---
 data/XML/vocations.xml                    | 16 ++++++++--------
 data/actions/scripts/misc/fishing_rod.lua | 19 ++++++++-----------
 data/items792/items.srv                   |  6 +++---
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/data/XML/vocations.xml b/data/XML/vocations.xml
index b681928..6daa64a 100644
--- a/data/XML/vocations.xml
+++ b/data/XML/vocations.xml
@@ -9,7 +9,7 @@
 		<skill id="5" multiplier="1.5"/>
 		<skill id="6" multiplier="1.1"/>
 	</vocation>
-	<vocation id="1" flagid="1" name="Sorcerer" description="a sorcerer" gaincap="10" gainhp="5" gainmana="30" gainhpticks="6" gainhpamount="1" gainmanaticks="3" gainmanaamount="2" manamultiplier="1.1" attackspeed="2000" basespeed="70" soulmax="100" gainsoulticks="120" fromvoc="1">
+	<vocation id="1" flagid="1" name="Sorcerer" description="a sorcerer" gaincap="10" gainhp="5" gainmana="30" gainhpticks="6" gainhpamount="1" gainmanaticks="2" gainmanaamount="2" manamultiplier="1.1" attackspeed="2000" basespeed="70" soulmax="100" gainsoulticks="120" fromvoc="1">
 		<skill id="0" multiplier="1.5"/>
 		<skill id="1" multiplier="2.0"/>
 		<skill id="2" multiplier="2.0"/>
@@ -18,7 +18,7 @@
 		<skill id="5" multiplier="1.5"/>
 		<skill id="6" multiplier="1.1"/>
 	</vocation>
-	<vocation id="2" flagid="2" name="Druid" description="a druid" gaincap="10" gainhp="5" gainmana="30" gainhpticks="6" gainhpamount="1" gainmanaticks="3" gainmanaamount="2" manamultiplier="1.1" attackspeed="2000" basespeed="70" soulmax="100" gainsoulticks="120" fromvoc="2">
+	<vocation id="2" flagid="2" name="Druid" description="a druid" gaincap="10" gainhp="5" gainmana="30" gainhpticks="6" gainhpamount="1" gainmanaticks="2" gainmanaamount="2" manamultiplier="1.1" attackspeed="2000" basespeed="70" soulmax="100" gainsoulticks="120" fromvoc="2">
 		<skill id="0" multiplier="1.5"/>
 		<skill id="1" multiplier="1.8"/>
 		<skill id="2" multiplier="1.8"/>
@@ -27,7 +27,7 @@
 		<skill id="5" multiplier="1.5"/>
 		<skill id="6" multiplier="1.1"/>
 	</vocation>
-	<vocation id="3" flagid="4" name="Paladin" description="a paladin" gaincap="20" gainhp="10" gainmana="15" gainhpticks="4" gainhpamount="1" gainmanaticks="4" gainmanaamount="2" manamultiplier="1.4" attackspeed="2000" basespeed="70" soulmax="100" gainsoulticks="120" fromvoc="3">
+	<vocation id="3" flagid="4" name="Paladin" description="a paladin" gaincap="20" gainhp="10" gainmana="15" gainhpticks="4" gainhpamount="1" gainmanaticks="3" gainmanaamount="2" manamultiplier="1.4" attackspeed="2000" basespeed="70" soulmax="100" gainsoulticks="120" fromvoc="3">
 		<skill id="0" multiplier="1.2"/>
 		<skill id="1" multiplier="1.2"/>
 		<skill id="2" multiplier="1.2"/>
@@ -36,7 +36,7 @@
 		<skill id="5" multiplier="1.1"/>
 		<skill id="6" multiplier="1.1"/>
 	</vocation>
-	<vocation id="4" flagid="8" name="Knight" description="a knight" gaincap="25" gainhp="15" gainmana="5" gainhpticks="3" gainhpamount="1" gainmanaticks="6" gainmanaamount="2" manamultiplier="3.0" attackspeed="2000" basespeed="70" soulmax="100" gainsoulticks="120" fromvoc="4">
+	<vocation id="4" flagid="8" name="Knight" description="a knight" gaincap="25" gainhp="15" gainmana="5" gainhpticks="3" gainhpamount="2" gainmanaticks="4" gainmanaamount="2" manamultiplier="3.0" attackspeed="2000" basespeed="70" soulmax="100" gainsoulticks="120" fromvoc="4">
 		<skill id="0" multiplier="1.1"/>
 		<skill id="1" multiplier="1.1"/>
 		<skill id="2" multiplier="1.1"/>
@@ -45,7 +45,7 @@
 		<skill id="5" multiplier="1.1"/>
 		<skill id="6" multiplier="1.1"/>
 	</vocation>
-	<vocation id="5" flagid="1" name="Master Sorcerer" description="a master sorcerer" gaincap="10" gainhp="5" gainmana="30" gainhpticks="4" gainhpamount="1" gainmanaticks="2" gainmanaamount="2" manamultiplier="1.1" attackspeed="2000" basespeed="70" soulmax="200" gainsoulticks="15" fromvoc="1">
+	<vocation id="5" flagid="1" name="Master Sorcerer" description="a master sorcerer" gaincap="10" gainhp="5" gainmana="30" gainhpticks="6" gainhpamount="1" gainmanaticks="2" gainmanaamount="3" manamultiplier="1.1" attackspeed="2000" basespeed="70" soulmax="200" gainsoulticks="15" fromvoc="1">
 		<skill id="0" multiplier="1.5"/>
 		<skill id="1" multiplier="2.0"/>
 		<skill id="2" multiplier="2.0"/>
@@ -54,7 +54,7 @@
 		<skill id="5" multiplier="1.5"/>
 		<skill id="6" multiplier="1.1"/>
 	</vocation>
-	<vocation id="6" flagid="2" name="Elder Druid" description="an elder druid" gaincap="10" gainhp="5" gainmana="30" gainhpticks="4" gainhpamount="1" gainmanaticks="2" gainmanaamount="2" manamultiplier="1.1" attackspeed="2000" basespeed="70" soulmax="200" gainsoulticks="15" fromvoc="2">
+	<vocation id="6" flagid="2" name="Elder Druid" description="an elder druid" gaincap="10" gainhp="5" gainmana="30" gainhpticks="6" gainhpamount="1" gainmanaticks="2" gainmanaamount="3" manamultiplier="1.1" attackspeed="2000" basespeed="70" soulmax="200" gainsoulticks="15" fromvoc="2">
 		<skill id="0" multiplier="1.5"/>
 		<skill id="1" multiplier="1.8"/>
 		<skill id="2" multiplier="1.8"/>
@@ -63,7 +63,7 @@
 		<skill id="5" multiplier="1.5"/>
 		<skill id="6" multiplier="1.1"/>
 	</vocation>
-	<vocation id="7" flagid="4" name="Royal Paladin" description="a royal paladin" gaincap="20" gainhp="10" gainmana="15" gainhpticks="3" gainhpamount="1" gainmanaticks="3" gainmanaamount="2" manamultiplier="1.4" attackspeed="2000" basespeed="70" soulmax="200" gainsoulticks="15" fromvoc="3">
+	<vocation id="7" flagid="4" name="Royal Paladin" description="a royal paladin" gaincap="20" gainhp="10" gainmana="15" gainhpticks="3" gainhpamount="1" gainmanaticks="2" gainmanaamount="2" manamultiplier="1.4" attackspeed="2000" basespeed="70" soulmax="200" gainsoulticks="15" fromvoc="3">
 		<skill id="0" multiplier="1.2"/>
 		<skill id="1" multiplier="1.2"/>
 		<skill id="2" multiplier="1.2"/>
@@ -72,7 +72,7 @@
 		<skill id="5" multiplier="1.1"/>
 		<skill id="6" multiplier="1.1"/>
 	</vocation>
-	<vocation id="8" flagid="8" name="Elite Knight" description="an elite knight" gaincap="25" gainhp="15" gainmana="5" gainhpticks="2" gainhpamount="1" gainmanaticks="4" gainmanaamount="2" manamultiplier="3.0" attackspeed="2000" basespeed="70" soulmax="200" gainsoulticks="15" fromvoc="4">
+	<vocation id="8" flagid="8" name="Elite Knight" description="an elite knight" gaincap="25" gainhp="15" gainmana="5" gainhpticks="2" gainhpamount="2" gainmanaticks="3" gainmanaamount="2" manamultiplier="3.0" attackspeed="2000" basespeed="70" soulmax="200" gainsoulticks="15" fromvoc="4">
 		<skill id="0" multiplier="1.1"/>
 		<skill id="1" multiplier="1.1"/>
 		<skill id="2" multiplier="1.1"/>
diff --git a/data/actions/scripts/misc/fishing_rod.lua b/data/actions/scripts/misc/fishing_rod.lua
index cb2692e..b061f17 100644
--- a/data/actions/scripts/misc/fishing_rod.lua
+++ b/data/actions/scripts/misc/fishing_rod.lua
@@ -19,18 +19,15 @@ function onUse(player, item, fromPosition, target, toPosition)
 	end
 	
 	if not Tile(player:getPosition()):hasFlag(TILESTATE_PROTECTIONZONE) then
-		if player:getItemCount(3492) >= 1 then
-			player:addSkillTries(SKILL_FISHING, 1)
-			if math.random(1, 100) <= math.min(math.max(10 + (player:getEffectiveSkillLevel(SKILL_FISHING) - 10) * 0.597, 10), 50) then
-				player:addItem(3578, 1)
-				
-				if target:getId() ~= 622 then
-					target:transform(4609, 1)
-				end
-				
-				target:decay()
-				player:removeItem(3492, 1)
+		player:addSkillTries(SKILL_FISHING, 1)
+		if math.random(1, 100) <= math.min(math.max(10 + (player:getEffectiveSkillLevel(SKILL_FISHING) - 10) * 0.597, 10), 50) then
+			player:addItem(3578, 1)
+			
+			if target:getId() ~= 622 then
+				target:transform(4609, 1)
 			end
+			
+			target:decay()
 		end
 	end
 	
diff --git a/data/items792/items.srv b/data/items792/items.srv
index cfd9324..b9c0df5 100644
--- a/data/items792/items.srv
+++ b/data/items792/items.srv
@@ -13838,7 +13838,7 @@ Attributes  = {Weight=80,SlotType=RING,ManaShield=1,ExpireTarget=0,TotalExpireTi
 TypeID      = 3089
 Name        = "a life ring"
 Flags       = {Take,Expire,ShowDetail}
-Attributes  = {Weight=80,SlotType=RING,HealthTicks=6000,HealthGain=2,ManaTicks=6000,ManaGain=8,ExpireTarget=0,TotalExpireTime=1200,DeEquipTarget=3052}
+Attributes  = {Weight=80,SlotType=RING,HealthTicks=2000,HealthGain=1,ManaTicks=2000,ManaGain=4,ExpireTarget=0,TotalExpireTime=1200,DeEquipTarget=3052}
 
 TypeID      = 3090
 Name        = "a time ring"
@@ -13893,7 +13893,7 @@ Attributes  = {Weight=110,SlotType=RING,SuppressDrunk=1,ExpireTarget=0,TotalExpi
 TypeID      = 3100
 Name        = "a ring of healing"
 Flags       = {Take,Expire,ShowDetail}
-Attributes  = {Weight=80,SlotType=RING,HealthTicks=6000,HealthGain=6,ManaTicks=6000,ManaGain=24,ExpireTarget=0,TotalExpireTime=450,DeEquipTarget=3098}
+Attributes  = {Weight=80,SlotType=RING,HealthTicks=2000,HealthGain=3,ManaTicks=2000,ManaGain=12,ExpireTarget=0,TotalExpireTime=450,DeEquipTarget=3098}
 
 TypeID      = 3101
 Name        = "a screaming spellbook"
@@ -16169,7 +16169,7 @@ Attributes  = {Weight=500}
 TypeID      = 3549
 Name        = "soft boots"
 Flags       = {Take,Expire,ShowDetail}
-Attributes  = {Weight=800,DeEquipTarget=6529,SlotType=FEET,ExpireTarget=6530,TotalExpireTime=14400,HealthGain=1,HealthTicks=2000,ManaGain=2,ManaTicks=1000}
+Attributes  = {Weight=800,DeEquipTarget=6529,SlotType=FEET,ExpireTarget=6530,TotalExpireTime=14400,HealthGain=3,HealthTicks=4000,ManaGain=6,ManaTicks=2000}
 
 TypeID      = 3550
 Name        = "patched boots"