6406 Commits

Author SHA1 Message Date
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
Leere
cf117b1a4d Add the ability to disable a tradeskill recipe 2013-10-31 17:58:44 +01:00
Uleat
1bae570b68 Merge pull request #86 from EQEmu/uleat_cleanup_1
Uleat cleanup 1 - Note: The player profile blob struct code has been changed, but it does not affect the actual database blob size or alignment. That said, it probably wouldn't be a bad idea to backup at least the character_ table.
2013-10-30 14:39:26 -07:00
Uleat
1f0e263b6e Fix for compile failure in deity.h - Thanks V! (I should write a book on gcc:vs differences..I have found almost all of them...) 2013-10-30 03:49:32 -04:00
Uleat
08706055af Final prep for extending skill use range - client patch and database are ready..just need the code in-between 2013-10-28 13:06:49 -04:00
Uleat
28bcf074fc Client patch prep work for extending usable skill range 2013-10-28 05:00:49 -04:00
Uleat
1c8aaf97bc Changelog entry clarification..did not explain the issue clearly... 2013-10-27 13:41:39 -04:00
Uleat
a891597f4c Prepped the client patch files for larger skill buffer size (not active) 2013-10-27 13:30:45 -04:00
Uleat
e3805d5920 Converted SkillType typedef enumeration to SkillUseTypes enumeration 2013-10-27 13:03:41 -04:00
Uleat
3e6be197e6 Changed ItemTypes to ItemUseTypes 2013-10-27 09:04:52 -04:00
Uleat
0d5fc26841 Converted MATERIAL defines to MaterialUseSlots enumeration 2013-10-27 08:01:37 -04:00
Uleat
df47e17c8e Changed ItemClass enumeration to ItemClassTypes enumeration 2013-10-27 06:38:34 -04:00
Uleat
e53fa1d873 Changed ItemUseType enumeration to ItemInstTypes enumeration - naming conflicted with definition 2013-10-27 05:45:52 -04:00
Uleat
d5152a0e59 Moved and expanded Deity-related code 2013-10-27 05:08:53 -04:00
Uleat
78e04dee99 Enforced naming standard on my recent changes 2013-10-27 04:17:08 -04:00
Uleat
b3d117f8c1 Improper skill in use allowing riposte fix (Archery and Throwing allowing riposte check..no known bug reports) 2013-10-27 03:25:27 -04:00
Uleat
cab77e83da High level debug (12) compile failure fix - I searched for as many as I could find with GrepWin, so there may be a few out there still 2013-10-27 03:13:10 -04:00
Michael Cook
b4068823ed Merge pull request #85 from vexyl/fix1
Fix for healing unconscious players.
2013-10-26 14:13:00 -07:00
vexyl
a694cf3079 Fix for healing unconscious players. 2013-10-26 13:46:03 -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
KimLS
4270d77692 Merge branch 'master' into base_data 2013-10-21 16:42:32 -07:00
KimLS
ec6c5519a5 More work on importing... I need my escape stuff from other branch for this though 2013-10-21 16:41:34 -07: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
KimLS
cdb29be4f3 Merge branch 'master' into base_data 2013-10-18 21:44:18 -07:00
KimLS
4ef9732e37 Compile fix 2013-10-18 21:43:47 -07:00
KimLS
f2f4e55818 Import/Export util start 2013-10-18 21:23:45 -07:00
Uleat
403ac53a9e Renamed/expanded 'BagTypes' enumeration 2013-10-18 20:33:41 -04:00
KimLS
cdcda943be Base data for hp/mana/end calcs, mostly but not completely correct 2013-10-18 00:09:00 -07:00
KimLS
2c25241763 Fix for lua say links, other branch taking longer than thought so making this its own commit 2013-10-16 15:47:08 -07:00