pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-05-16 22:58:34 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge branch 'master' into shared_mem

Browse Source
This commit is contained in:
KimLS
2013-02-17 22:02:45 -08:00
parent 53d6e4000c a41874b6a7
commit a5ad05f274
18 changed files with 1218 additions and 193 deletions
Download Patch File Download Diff File Expand all files Collapse all files
common/database.h
+1
View File
@@ -47,6 +47,7 @@ class NPC;
class SpawnGroupList;
class Petition;
class Client;
class Merc;
struct Combine_Struct;
//struct Faction;
//struct FactionMods;
common/ruletypes.h
+1
View File
@@ -106,6 +106,7 @@ RULE_INT (Mercs, UpkeepIntervalS, 180)
RULE_BOOL ( Mercs, AllowMercs, false )
RULE_INT (Mercs, AggroRadius, 100) // Determines the distance from which a merc will aggro group member's target(also used to determine the distance at which a healer merc will begin healing a group member)
RULE_INT (Mercs, AggroRadiusPuller, 25) // Determines the distance from which a merc will aggro group member's target, if they have the group role of puller (also used to determine the distance at which a healer merc will begin healing a group member, if they have the group role of puller)
RULE_INT (Mercs, ResurrectRadius, 50) // Determines the distance from which a healer merc will attempt to resurrect a group member's corpse
RULE_INT (Mercs, ScaleRate, 100)
RULE_CATEGORY_END()