pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-06-17 10:48:21 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Merge branch 'master' into tob_patch

Browse Source
This commit is contained in:
KimLS
2026-04-20 18:41:45 -07:00
parent 3035e906fe 5dc093fe5e
commit dceec36fad
16 changed files with 323 additions and 116 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/ruletypes.h
+1
View File
@@ -255,6 +255,7 @@ RULE_BOOL(Mercs, AllowMercSuspendInCombat, true, "Allow merc suspend in combat")
RULE_BOOL(Mercs, MercsIgnoreLevelBasedHasteCaps, false, "Ignores hard coded level based haste caps.")
RULE_INT(Mercs, MercsHasteCap, 100, "Haste cap for non-v3(over haste) haste")
RULE_INT(Mercs, MercsHastev3Cap, 25, "Haste cap for v3(over haste) haste")
RULE_INT(Mercs, MaxMercSlots, 6, "Maximum number of mercenary slots per character (max = MAXMERCS)")
RULE_CATEGORY_END()
RULE_CATEGORY(Guild)