8094 Commits

Author SHA1 Message Date
badcaptain
ea72975e69 Fixed Merc duplicate save bug, focus items, spell_scale and heal_scale now work implemented, new merc equipment (with focus items), added checks during merc hire, unsuspend, & timer update for states where a merc can't be hired, unsuspended, or can't be retained due to insufficient funds, no room in group, in raid, invalid merc data, etc, and give appropriate feedback, added rules for charging of merc purchase and upkeep costs. 2013-03-01 00:01:27 -05:00
KimLS
92ed7e694f Merge branch 'master' into shared_mem 2013-02-26 21:29:34 -08:00
Alex
a95205905e Merge pull request #16 from af4t/TomeFix
Melee tomes named "Skill: ..." can be handed to guildmasters and memoriz...
2013-02-26 01:09:33 -08:00
af4t
945db17cb8 Fix targeting for summoned pets in Mob::DetermineSpellTargets 2013-02-25 10:38:03 -05:00
af4t
e48d59b07b Melee tomes named "Skill: ..." can be handed to guildmasters and memorized. 2013-02-25 09:19:07 -05:00
KimLS
d42ff6ce19 Merge branch 'master' into shared_mem 2013-02-23 22:43:24 -08:00
Derision
34a4b2ab37 Misc fizes. 2013-02-23 23:12:10 +00:00
KimLS
9c1159837a Merge branch 'master' into shared_mem 2013-02-23 15:04:16 -08:00
KimLS
147c96970c Moved faction stuff around, removed stupid external item status stuff 2013-02-23 15:03:15 -08:00
Derision
e7e1b46b36 Set #reloadlevelmods to status 255 2013-02-23 22:17:19 +00:00
Derision
299dc525d0 Set #reloadworld to 255 status 2013-02-23 22:00:43 +00:00
KimLS
c31b2b65c1 NPC Faction lists to new shared memory scheme 2013-02-23 13:45:19 -08:00
KimLS
f32048808a c++11 linux compile conflicts with perl 2013-02-23 00:06:03 -08:00
KimLS
8c425ff9d8 Merge branch 'master' into shared_mem 2013-02-22 22:36:30 -08:00
KimLS
1b44123551 Slight cleanup on recent pull req + changing versions up 2013-02-22 22:31:07 -08:00
mackal
dd913de1a2 Mobs will now be removed from XTarget when they clear their feign memory aggro 2013-02-22 22:27:03 -05:00
KimLS
6f13d0cfbc Partial work on loot tables (non-compiling) 2013-02-21 22:13:33 -08:00
KimLS
3e9c2a06a3 Items in shared memory 2013-02-20 22:36:30 -08:00
KimLS
ef9498b03a Got rid of rules global (ugh) and gonna start work on items loading next 2013-02-20 15:35:46 -08:00
KimLS
8eb7d0aaa8 Skill caps load with new smem scheme 2013-02-20 13:54:26 -08:00
KimLS
f8bae86082 Spells via shared memory work, removal of blah, general fixes 2013-02-19 22:20:30 -08:00
KimLS
acecff23f4 Almost have spells loaded 2013-02-19 16:50:05 -08:00
KimLS
7ce6f4de0d More shared memory work + moved spdat from zone to common 2013-02-19 15:33:21 -08:00
KimLS
d4dbf0042e Merge branch 'master' into shared_mem 2013-02-18 19:26:11 -08:00
KimLS
cb01d245e6 EVENT_DEATH for PlayerQuests 2013-02-18 19:22:07 -08:00
KimLS
0d16361a40 Working on shared memory stuff - removed some stuff dealing with older code and loading spells from the non-database 2013-02-18 19:00:07 -08:00
mackal
11d9838faa Added the item_name field to potionbelt to give the user the Tool Tip 2013-02-18 14:19:20 -05:00
Derision
9680c039f0 Charmed pets should no longer be targettable with F8. Charmed pets no longer get a surname of Soandso's Pet. 2013-02-18 18:58:26 +00:00
KLS
9f63498a64 Quest Interface wont attempt to keep loading GlobalQuest sub over and over and over... 2013-02-18 09:12:14 -08:00
Alex
aa20e5b5e3 Issue where not having a global npc quest file may cause the server to crash on bootup 2013-02-18 09:01:49 -08:00
JJ
c9d4816a88 Garble text for drunk characters. 2013-02-18 02:21:34 -05:00
joligario
3feeced884 Chat garbled for drunk characters. 2013-02-18 01:59:43 -05:00
badcaptain
a41874b6a7 Moved merc save data from extended player profile to new merc table, save merc buffs, added cure and rez spells to healer merc. 2013-02-18 00:50:19 -05:00
KimLS
a37211cb83 Forgot to take out my comment code - doh 2013-02-17 15:40:29 -08:00
KimLS
4e802921a5 Fix for sub checking on global npc quests 2013-02-17 15:36:53 -08:00
KimLS
c6d8895b70 One fix to QuestParserCollection for global npc quests, HasSub is not working at all right with it. Need to check it out later tonight 2013-02-17 15:22:35 -08:00
Derision
23b2b599a7 Fixed bug where BecomeTrader packets were only being sent to the Trader, not all other clients in the bazaar. 2013-02-17 20:23:34 +00:00
Derision
07979ce2de Client version is now returned by the stream proxy as a number. 2013-02-17 18:09:31 +00:00
Derision
d1afad47aa Added optional guildid and minstatus parameters to quest::gmsay(<messsage>, [color], [toworld], [guildid], [minstatus]) 2013-02-17 10:19:12 +00:00
KimLS
15dc9cfaf4 Some warning fixes, unreferenced local variables. 2013-02-16 22:07:32 -08:00
mackal
38d4fbc863 Remove old filters and change all remaining old to new (Also fix Auction filtering out OOC as well due to incorrect define) 2013-02-16 20:14:07 -05:00
mackal
07950b7a58 Fix calc of resuse timers on multi-rank AAs 2013-02-16 19:47:12 -05:00
KimLS
b14519b1f5 Derision's revert from svn I missed. 2013-02-16 16:25:57 -08:00
KimLS
da7347f76f svn -> git Migration 2013-02-16 16:14:39 -08:00