pa/eqemu-server
2
0 Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2026-10-08 05:23:39 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
608 Commits 89 Branches 159 Tags
32e5ed5ad8bbe35a42e582fabe15bd547ad7e81e
Commit Graph
79 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Michael Cook (mackal) 32e5ed5ad8 Merge branch 'master' of github.com:KayenEQ/Server into KayenEQ-master 
Conflicts:
	changelog.txt
 2013-12-15 23:51:21 -05:00
Michael Cook 65afbd4147 Moved BlockedBuffs check down for spell effects 2013-12-15 18:44:45 -05:00
Michael Cook 81e04ee185 Fix some indentation 2013-12-15 03:21:57 -05:00
Michael Cook b9c270fab6 Merge branch 'master' of github.com:EQEmu/Server 
Conflicts:
	changelog.txt
 2013-12-14 16:44:04 -05:00
Michael Cook 48db481fbb Fix blocked buffs from failing 
When a buff is blocked it should just fail to be applied
instead of interrupting. Mana should also be eaten.
 2013-12-14 16:42:12 -05:00
Michael Cook c70ea4a621 Fix haste caps 
Before these were mostly guess work, now based on what clients report
since they do their own calculations so are most likely correct.
 2013-12-11 15:44:59 -05:00
Michael Cook 76ec6e4da2 Fixed crippling blow issues with berserker frenzy 
Also added two rules to control when to enter/exit berserker frenzy
 2013-12-11 01:49:51 -05:00
Michael Cook (mackal) cd2825288d Fix issue with SpellType_Charm case in AICastSpell 2013-12-04 00:52:12 -05:00
Michael Cook d95fdda30f Fix procing off of unattackable things 
This /might/ be a little restrictive, but it should prevent easy
farming of bone chips from Boneshear etc
 2013-12-03 16:12:13 -05:00
Michael Cook 4fdcf604f2 Added #showspellslist command to show us a mob's spells 2013-12-03 15:57:50 -05:00
Michael Cook 0f54830bc5 Stacking issues should be resolved now 
I have a feeling this could be slightly better, but it works correctly.
 2013-11-29 18:32:30 -05:00
Michael Cook d329fe0c12 Revert "Fixed issue with SE_StackingCommand_Overwrite" 
This reverts commit a7ce852ca5.
 2013-11-29 15:35:51 -05:00
Michael Cook a7ce852ca5 Fixed issue with SE_StackingCommand_Overwrite 
SE_StackingCommand_Overwite uses the calc to figure out the slot to check.
Seems that calc 202 is slot 1 and 201 is actually something special. It
could be any slot, but need further investigation, for now, just ignore it.
 2013-11-27 16:05:09 -05:00
Michael Cook b4fce37c14 Quick fix to issue with self buffs 
casting_spell_targetid isn't guaranteed to be correct at that point in the code
Quick fix for now
 2013-11-27 14:38:03 -05:00
Michael Cook 0567073ca0 Quick fix for dot issue introduced in 765b5ee8 
This could probably be done better
 2013-11-19 18:34:20 -05:00
Michael Cook e33eb9d7b0 Partially implement dot_stacking_exempt 
When it is 1 the spell will block it from other casters
Not 100% sure on when it's -1 so not currently used
 2013-11-19 17:43:40 -05:00
Michael Cook (mackal) 10ee3ea346 Fixed shared memory read me 2013-11-19 00:09:41 -05:00
Michael Cook (mackal) 62b7eda9e9 Added read me to shared_memory 2013-11-19 00:08:22 -05:00
Michael Cook (mackal) 917a8ed389 Fix some errors in comments 2013-11-18 16:21:10 -05:00
Michael Cook (mackal) 300799fdc8 Added npc_types.assistradius, defaults to npc_types.aggroradius if set to 0 2013-11-18 12:44:39 -05:00
Michael Cook 09dd3c1b37 Fixed an issue that arose from 78ab3471 
Reworked how Mob::_GetMovementSpeed worked to fix an issue of walking
with a sufficiently high movemod.

Added a rule Character:BaseRunSpeedCap (default 158) to control the
cap on runspeed from buffs. Hardcapped to 225 for sanity's sake.
 2013-11-17 19:37:49 -05:00
Michael Cook (mackal) 36233538fd Some whitespace fixes in zone/spells.cpp 2013-11-17 00:34:58 -05:00
Michael Cook 3d5b3d1e8c Added Mob::DoCastingChecks() which checks for various casting fail conditions while casting 2013-11-17 00:31:17 -05:00
Michael Cook 3c2ae8250f Merge pull request #91 from Leere/drink_message 
Fix for auto-consume drinking message
 2013-11-15 19:23:02 -08:00
Michael Cook 08b5225a13 Merge pull request #90 from Leere/stacking_issue 
Fix for a stacking issue with SE_StackingCommand_Block for druid skins
 2013-11-15 13:15:53 -08:00
Michael Cook a40a34d2e8 Fixed Mob::CalcFocusEffect()'s SE_LimitEffect 2013-11-15 01:17:27 -05:00
Michael Cook (mackal) 983ee2d39b Merge branch 'master' of github.com:EQEmu/Server 2013-11-14 20:28:01 -05:00
Michael Cook (mackal) e1255af708 Fix Spell level restrictions 
I made an incorrect assumption, fixed now
 2013-11-14 20:26:58 -05:00
Michael Cook 23ab896dfc Fix last commit .... 2013-11-13 18:04:11 -05:00
Michael Cook d094a09ded Implemented Singing/Instrument Mastery as an AA bonus 
Don't forget to source the SQL file!
 2013-11-13 18:03:08 -05:00
Michael Cook 3f8ee533d3 Implement bard song instrument mod caps 
The maximum bard songs can be effected by instrument mods is 3.6.
This is set by the rule Character:BaseInstrumentSoftCap which defaults to 36
Also fix Echo of Taelosia and Ayonae's Tutelage to increase the mod cap.
 2013-11-13 15:07:34 -05:00
Michael Cook 0c3c84d711 Merge branch 'master' of github.com:EQEmu/Server 2013-11-12 22:32:44 -05:00
Michael Cook 79c53a41a8 Add some sanity for bard songs in snares ... 2013-11-12 22:32:03 -05:00
Michael Cook 78ab347171 Fix walk speed calculation 
Walk speed should be calculated as a movement speed reduction that
stacks with snares so it's possible to snare a mob FD and have it
not be able to walk back.
 2013-11-11 23:55:43 -05:00
Michael Cook d83b94d231 Revert "Fixed non-attacking related movement while mobs are snared" 
Did some testing, this isn't exactly the case on live.

This reverts commit ed6c46f7ff.
 2013-11-11 21:06:48 -05:00
Michael Cook (mackal) ed6c46f7ff Fixed non-attacking related movement while mobs are snared 
On live a nec/shd normal splitting involved snaring the mob you want
and FDing after they moved enough. The non-snared mobs would return home
and the snared mob would just sit there until it was no longer snared.
There is even a nice flash video! http://www.dzert.com/downloads/eq/fd02.swf
This might need some tweaking, but I'm not sure of any instances where it would
break things...
 2013-11-11 18:18:12 -05:00
Michael Cook (mackal) 925e19b15c Fix database scheme comments that got clobbered on nullptr conversion 2013-11-11 15:37:20 -05:00
Michael Cook 2be71fc2ec Cleaned up common/spdat.cpp 
There was a lot of stuff that I found that the level of readability.
I cleaned up a lot of the stuff, no functionality should be changed
unless where noted below.

* IsPartialDeathSaveSpell is now generic and no longer uses a hardcoded spell id
* IsFullDeathSaveSpell is now generic and no longer uses a hardcoded spell id

If these functions were actually used in the spell effects it would probably
fix issues with newer spells (which there are on live)
 2013-11-10 21:37:01 -05:00
Michael Cook b4068823ed Merge pull request #85 from vexyl/fix1 
Fix for healing unconscious players.
 2013-10-26 14:13:00 -07:00
Michael Cook 3c09613d01 Changed the MT_Shout to MT_SpellFailure in Mob::SpellOnTarget 2013-10-24 17:38:46 -04:00
Michael Cook 36d336e69c Fix some memory leaks in Mob::SpellOnTarget 
This should fix the memory leak introduced in the last commit and
a few lingering memory leaks, don't think they should break anything
 2013-10-24 17:35:21 -04:00
Michael Cook a06fe1d02e Implemented buff level restrictions 
Higher level buffs can't be cast on lower level toons.
The formula was based on information found here: http://samanna.net/eq.general/buffs.shtml
This behavior is controlled by the rule Spells:BuffLevelRestrictions which defaults to true.
 2013-10-21 19:13:55 -04:00
Michael Cook 56ba87577b GetMinLevel will now return 0 for more cases 
For some reason EQ uses 127 (melee classes), 254 (some AAs), and 255
in the class level for spells a class doesn't have
 2013-10-21 19:10:01 -04:00
Michael Cook 98c835e470 Fix Titanium clients from not being able to start in Tutorial zone. 2013-10-12 00:29:44 -04:00
Michael Cook 2019379a42 bool* foo = false should probably be an error, GCC 4.8+ at least warns about it, clang I think fails on it. 2013-10-11 00:00:21 -04:00
Michael Cook 15335509c2 Merge branch 'master' of github.com:EQEmu/Server 
Conflicts:
	changelog.txt
 2013-10-10 23:45:15 -04:00
Michael Cook da401acdb2 Fix mana and timer being used on single target buffs failing 
Single target buffs shouldn't have their mana consumed or their
reuse timers set if they fail the Mob::SpellOnTarget call in
Mob::SpellFinished. Ex. Night's Dark Terror not taking hold
(no free slots) or Target running out of range.
Debuffs do not get this nice behavior.
 2013-10-10 23:17:02 -04:00
Michael Cook c13c039721 Merge pull request #83 from AMDmi3/patch-1 
Simplify conditional linking with libdl
 2013-10-09 08:33:27 -07:00
Michael Cook 3a95f81196 Fixed more instances of AA timers being eaten 
Every time I touch zone/AA.cpp to fix timers it gets uglier.
This should fix the bug reported here: http://www.peqtgc.com/phpBB3/viewtopic.php?f=17&t=14125
It should also fix AAs not being reset when it when you have no buff slots free (confirmed on live)
 2013-10-09 02:00:49 -04:00
Michael Cook 9a19a00bdc Added IsBuffSpell(spell_id). This will return true if the spell would end up having a duration, which will mean it would end up in one of the many buff windows on the client. This just makes sure the spell has a buffduration or buffdurationformula, which means the calculation will return a duration 
Replaced all instances of CalcBuffDuration being used to determine if a spell was a buff with IsBuffSpell
Removed Mob::HasBuffIcon since it does the same thing IsBuffSpell does in a more convoluted way and had a rather missing leading name
Fixed issues that arose from the 10/03/2013 changes
 2013-10-08 17:24:07 -04:00
Michael Cook 6b4b259753 Fix when the random +1 tick is added to nerf extension focus effects to where they should be 2013-10-03 23:04:58 -04:00
Michael Cook 2bde0b40bb Fixed issue with #showstats window, should probably be refactored to completely use stringstream or to_string whenever VS2010 support is dropped 2013-09-30 22:17:34 -04:00
Michael Cook (mackal) d119ed058b Add /pet hold on and /pet hold off support for UF/RoF 2013-09-13 15:20:45 -04:00
Michael Cook 6d21823959 Prevent Monster Summoning from summoning a portal in bothunder 2013-07-01 16:03:04 -04:00
Michael Cook 02eb56a696 Fix Monster Summoning related to giants/cyclops 2013-07-01 15:22:07 -04:00
Michael Cook 0fdfe025cb Remove 'using namespaces std' fixes #61 2013-05-22 16:17:19 -04:00
Michael Cook 73a4e87379 FreeBSD support and clean up of unnecessary ifdef FREEBSD 2013-05-11 14:32:14 -04:00
mackal f6100ed834 Fixed NPC::GetScore and XS_NPC_GetScore 2013-05-08 17:07:49 -04:00
Michael Cook 059ecdb50b Fix NULL to nullptr for SQL queries take 2 2013-05-07 18:20:09 -04:00
Michael Cook 0838d4507a Fix NULL to nullptr for SQL queries 2013-05-07 17:41:05 -04:00
mackal b8febdd440 Realized there was a better way to do the DB entries for salvage, so I changed the script. 
Run the optional 2013_04_09_SalvageCleanOld.sql if you ran the old script.
 2013-04-09 14:50:51 -04:00
mackal f8795bcd72 Implemented Salvage AA. 
Added a new coloumn to tradeskill_recipe_entires called salvagecount that works much in the same way to fail/success/componentcount
The code will default to the component list if nothing is found with a salvagecount
New script: generate_salvage.py will generate the entries for recipes with a failcount (make sure your config is vaild XML as well, it complains if it isn't)
 2013-04-08 22:33:19 -04:00
mackal 53301289f5 Merge branch 'salvage' 2013-04-08 17:30:22 -04:00
mackal 51896050ed Fix XML Type Declaration in example configs 2013-04-08 17:20:03 -04:00
mackal 81ca7a1bfd More work on salvage, added some extra checks and won't return stacks of items 2013-04-08 14:16:08 -04:00
mackal 91c817d9dd Work on implementing salvage 2013-04-07 22:38:43 -04:00
mackal 20f086dc37 Switched rest of pet messages to MT_PetResponse 
Overloaded Mob::Say_StringID with a version that takes a message type
 2013-04-03 16:09:44 -04:00
mackal 353d7cede0 Bards can now use instant cast AAs while singing (Fading Memories, Boastful Bellow) 
AA reuse timers now start before the spell is cast and reset upon failure or canceling
 2013-04-01 17:19:45 -04:00
mackal 96b42ed86f Fix pet message to use StringIDs, most should be correct related to pet "saying" or just the client getting a message 
Added the pet taunting message
 2013-03-30 22:57:20 -04:00
mackal 2073ca8d38 Fixed and cleaned up Client::Escape() 
Fixed SE_FadingMemories to use Client::Escape()
Rogue AA Escape now uses a spell instead of AA Action
Bard AA Fading Memories now only uses the AA Action to eat mana
 2013-03-23 18:34:06 -04:00
mackal 886c7bf634 Fixed stacking issues with SE_Limit* (ex. Unholy Aura Discipline and Aura of Reverence) 2013-03-20 23:29:00 -04: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
mackal 357646466a Changelog udpated 2013-02-18 14:22:09 -05: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
mackal 20fb899d5d Merge branch 'master' of https://github.com/EQEmu/Server.git 2013-02-16 20:21:53 -05: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 234cd0c4ff Merge remote-tracking branch 'upstream/master' 2013-02-16 19:53:51 -05:00
mackal a510d2593f Update change log 2013-02-16 19:50:19 -05:00
mackal 07950b7a58 Fix calc of resuse timers on multi-rank AAs 2013-02-16 19:47:12 -05:00