586 Commits

Author SHA1 Message Date
SecretsOTheP
2f8cbb3a9d Fixes to the following crashes seen on PEQ:
http://www.peqtgc.com/phpBB3/viewtopic.php?f=1&t=14293&p=67404#p67404
http://www.peqtgc.com/phpBB3/viewtopic.php?f=1&t=14293&p=67105#p67105
2013-11-22 15:32:02 -05:00
Alex
093af6af0b Merge pull request #92 from clucksoft/master
suspend/ban kick fix
2013-11-20 02:36:27 -08: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
clucksoft
fd10ddf86d suspend/ban kick fix 2013-11-19 12:48:59 -08:00
SecretsOTheP
edd4d47929 Merge branch 'master' of https://github.com/EQEmu/Server 2013-11-19 09:58:18 -05:00
SecretsOTheP
f31b9ad98b Made the variable for disabling the logging system always default to ON instead of OFF. Changed the wording so it's less confusing.
This means that the debug logging information will not display at all by default, but the GM command logging will display enabled. If you need to diagnose the logs, simply turn them on at the expense of added CPU/Disk I/O
2013-11-19 09:57:52 -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
SecretsOTheP
8b7984cf7d Merge branch 'master' of https://github.com/EQEmu/Server 2013-11-18 23:56:11 -05:00
SecretsOTheP
4a0e07a54c Fixes to actually use the cmake defs added in the previous revision 2013-11-18 23:54:24 -05:00
SecretsOTheP
6e520c8476 Added options to CMake to disable GM command logging or disable logging entirely while keeping GM commands enabled.
Cleaned up some logging
2013-11-18 23:49:12 -05:00
Michael Cook (mackal)
917a8ed389 Fix some errors in comments 2013-11-18 16:21:10 -05:00
Sorvani
86bba4ff0e changed aggro_range to leach_range and tether_range appropriately 2013-11-18 13:53:21 -06: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
Sorvani
65e36e02fb fixed leash and tether to correctly used specified range. 2013-11-17 20:55:44 -06: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
Leere
6a95abb01f Fix for auto-consume drinking message 2013-11-16 03:40:35 +01:00
JJ
4c6fce5d5c Add a little more debug info to MQGate hack detection. 2013-11-15 19:31:43 -05: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
Leere
765b5ee826 Fix for a stacking issue with SE_StackingCommand_Block for druid skins 2013-11-15 18:03:13 +01: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
JJ
b99d476754 Change INSERT to REPLACE 2013-11-13 21:59:38 -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
cavedude00
2ffa13c993 Compile fix. 2013-11-12 16:08:31 -08:00
Ludwig
8af48bbe48 Merge pull request #89 from httm/master
Update exp.cpp
2013-11-12 15:22:47 -08:00
httm
65c0772d37 Update exp.cpp
Replaced elseif statements in group experience calculation with single if statement for calculation when membercount between 2 and 5
2013-11-12 18:06:24 -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 ed6c46f7ffa2a8155e0f22cc52730762df7aee35.
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
Ludwig
bc2ee8dce8 Merge pull request #88 from Leere/bardmana_fix
Fix for bard mana regen
2013-11-09 11:20:44 -08:00
Leere
1deef77f07 Fix for bard mana regen 2013-11-09 19:36:32 +01:00
KimLS
e00c57bc47 Fix to changelog conflict in merge. 2013-11-07 12:44:13 -08:00
JJ
da3ba12560 Fix for #npcedit qglobal 2013-11-06 21:12:57 -05:00
KimLS
f68b89b7d9 Prerelease commit 2013-11-06 13:48:35 -08:00
KimLS
c944aafb39 Merge branch 'master' into base_data 2013-11-06 13:18:20 -08:00
KimLS
0e6c9820cd Importing client files works now 2013-11-06 13:17:44 -08:00
JJ
b8d1838dcc Added in-game commands to enable/disable tradeskill recipes
-Commands: #enablerecipe recipe_id, #disablerecipe recipe_id
-Perl: quest::enablerecipe(recipe_id), quest::disablerecipe(recipe_id)
-Lua: eq.enable_recipe(recipe_id), eq.disable_recipe(recipe_id)
2013-11-01 23:55:17 -04:00
JJ
aba535b589 Merge pull request #87 from Leere/recipe_disable
Add the ability to disable a tradeskill recipe
2013-11-01 08:33:13 -07:00