pa/eqemu-server
2
0
Fork 0
mirror of https://github.com/EQEmu/Server.git synced 2025-12-15 20:51:29 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity
4,146 Commits 87 Branches 159 Tags
Commit Graph

2537 Commits

Author SHA1 Message Date
JJ
96925f0dde Some minor cleanup. [skip ci] 2015-01-31 17:03:44 -05:00
Russell Kinasz
2763fe36a3 RoF+ can send 200 items in merchantlist 2015-01-31 11:17:28 -08:00
Russell Kinasz
1e8916ee98 RoF+ can send 200 items in merchantlist 2015-01-31 11:11:06 -08:00
Trevius
fe6fa75385 Fixed FindGroundZ() and GetGroundZ() to once again utilize the X and Y arguments that are passed to them. 2015-01-31 11:44:25 -06:00
Akkadius
a6b95aeceb At point in which Client -> Server packet logging is working, will do more prechecking to declare that anything actually is subscribed to this category before outputting 2015-01-31 02:23:58 -06:00
Akkadius
7a3399e510 WOOPS! (That's what he said) 2015-01-30 23:17:11 -06:00
Akkadius
39a47ceb93 Implemented LUA counterpart of EVENT_ENVIRONMENTAL_DAMAGE 2015-01-30 23:15:48 -06:00
Akkadius
8229a578ee Implemented event type "EVENT_ENVIRONMENTAL_DAMAGE" 
- This event triggers when taking any sort of environmental damage. Example use:
	sub EVENT_ENVIRONMENTAL_DAMAGE{
		quest::debug("EVENT_ENVIRONMENTAL_DAMAGE");
		quest::debug("env_damage is " . $env_damage);
		quest::debug("env_damage_type is " . $env_damage_type);
		quest::debug("env_final_damage is " . $env_final_damage);
	}
	Result: (Test falling in Velks): http://i.imgur.com/tPRL7yL.png
 2015-01-30 23:01:31 -06:00
Akkadius
62197d7d33 Merge branch 'master' of https://github.com/EQEmu/Server 2015-01-30 22:58:52 -06:00
KayenEQ
e8553576f7 remove debug 2015-01-30 19:28:16 -05:00
KayenEQ
867b57bcf6 removed debug msg 2015-01-30 19:21:24 -05:00
Akkadius
ee57568c5d Implement Rule Based Environment damage multiplier 2015-01-30 18:12:00 -06:00
KayenEQ
ccbaf337f4 Fix for minimum charm and root resist chances (was always returning 0). 
Fix for pacification not doing a proper second resist check upon resisting intial pacification.
 2015-01-30 18:47:27 -05:00
Michael Cook (mackal)
b592d2e786 clang format some stuff in zone/command.cpp 2015-01-30 18:32:28 -05:00
KimLS
9a664476b0 Merge branch 'eqstream_ptr' 2015-01-30 15:03:40 -08:00
KimLS
f388a605dd Spelling errors and revised my cle change to put it much lower so it shouldn't have any side effects other than avoiding the crash 2015-01-30 15:03:02 -08:00
Alex
01c0a87cee Merge pull request #353 from EQEmu/eqstream_ptr 
Change EQStream raw pointers to be std::shared_ptr
 2015-01-30 13:41:49 -08:00
Michael Cook (mackal)
769987ca33 unique_ptr is a better fit here 2015-01-30 02:34:33 -05:00
Michael Cook (mackal)
8ec1cb949a Fix merc attack delay 2015-01-30 01:33:55 -05:00
KimLS
5e1a886e8f Merge branch 'master' into eqstream_ptr 2015-01-29 22:13:41 -08:00
Trevius
0aba2d578a Added more information to Mercenary Logging. 
Added potential fix for Mercenaries that fail to unsuspend.
Added a new "statscale" field to the merc_stats table that can be used to quickly balance Mercenary Stats based on Level.
The new "statscale" field now combines with the Mercs::ScaleRate rule value (default 100 percent for both).
 2015-01-29 23:04:41 -06:00
KayenEQ
30dbe34f78 Fix for range procs 2015-01-28 23:53:52 -05:00
Akkadius
0c934272c0 Added Logs::DebugQuest category per request from Trevius (Great idea) 
- Exported quest::debug(log_message, [debug_level = 1)
	- Example:
		quest::debug("This is a test debug message, level 1 (default)");
		quest::debug("This is a test debug message, level 1", 1);
		quest::debug("This is a test debug message, level 2", 2);
		quest::debug("This is a test debug message, level 3", 3);

		Result: http://i.imgur.com/6VoafGE.png
	- Uses traditional logging system to output this category
	- Required MySQL Source in Database version 9070
 2015-01-28 20:00:03 -06:00
KimLS
7dbe6a7426 Many tweaks to stream memory allocation, including but not limited to streams now are shared_ptrs. 2015-01-27 21:12:44 -08:00
Michael Cook (mackal)
5f545df312 Remove const 2015-01-27 21:48:11 -05:00
Michael Cook (mackal)
99164fe3f9 Switch AI timers to smart pointers 2015-01-27 21:28:38 -05:00
Akkadius
2211a63fe7 Some minor format changes to SaveCharacterCorpse 2015-01-27 20:24:43 -06:00
Akkadius
0f196cc995 Fix for ZoneDatabase::SaveCharacterCorpse where a corpse was empty and two individual corpses would be created 2015-01-27 19:46:31 -06:00
Michael Cook (mackal)
a12011ca1e Fix some bugs with starting AI in mercs 
The vtable ptr is that of the current constructor the code is in ...
 2015-01-27 19:53:13 -05:00
Michael Cook (mackal)
7dcd12fb9d clang-modernize use-nullptr on zone/mob_ai.cpp 2015-01-27 19:32:49 -05:00
Uleat
d037bc9dcc Merge branch 'master' of https://github.com/EQEmu/Server 2015-01-27 18:40:04 -05:00
Uleat
dd9f419735 Merge branch 'master' of https://github.com/EQEmu/Server 
Conflicts:
	changelog.txt
 2015-01-27 18:34:43 -05:00
Michael Cook (mackal)
62d1b0c2bd Merc NPCType memleak fix 2015-01-27 18:32:32 -05:00
Uleat
4832acde0b Finished ClientVersion naming conventions (don't forget to copy the renamed patch_UF.conf file) 2015-01-27 05:09:35 -05:00
Trevius
f17fb2a8e1 Removed "Mercenary Debug:" from the Mercenary Log entries. 
Resolved duplicate "You have no Mercenaries" messages when zoning without owning a Mercenary.
Mercenaries should now always be able to unsuspend if the timer is up.
More work on Mercenaries and Grouping to reduce bugs and redundant queries.
 2015-01-27 00:35:39 -06:00
JJ
6a43fd3b45 Merge pull request #351 from noudess/master 
Repair Faction System Messaging
 2015-01-26 20:55:17 -05:00
Uleat
64c302b07a Merge branch 'master' of https://github.com/EQEmu/Server 2015-01-26 19:44:50 -05:00
Uleat
89f8006f11 Changed the return type of Corpse::MoveItemToCorpse() to void and added a 'by address' parameter to replace it -- Fixed a bug that would 'unattune' soulbound items inside of bags 2015-01-26 19:44:33 -05:00
Paul Coene
5f3baf3649 Merge remote-tracking branch 'upstream/master' 2015-01-26 14:30:21 -05:00
Natedog2012
f67382c024 Allow ranged procs to work again 2015-01-26 13:58:54 -05:00
Akkadius
a698eff106 Natedog: Fix #gassign to work more appropriately and simplify the function 2015-01-25 23:27:44 -06:00
KimLS
0c7a861caf Fix for spell target det crash. Also added a command line arg to world ignore_db that lets you ignore the db conversion process for servers that dont need it. 2015-01-25 14:18:30 -08:00
Trevius
fc5266e115 Added Logs::Mercenaries to the new Logging System. Logging of Mercenary information is off by default with the required SQL. 2015-01-25 12:31:07 -06:00
Trevius
966acb25b3 Fixed an issue where Mercenaries were causing several DB queries per second while suspended. 2015-01-25 11:28:34 -06:00
Paul Coene
60412276da Report repair as well as change from Update Personal Faction. 2015-01-25 09:55:41 -05:00
Paul Coene
22de30bab3 Repair faction messaging code. 
The messages were being based on total faction rather than personal faction.
The personal faction range is all that is needed to detremine which message.

There were several bugs as well.  Fixed several edge conditions
 2015-01-25 09:46:00 -05:00
Akkadius
5266d7b25c Add extra checking at the root of Log.Out to check if the category is subscribed to any of the output methods before trying to parse message strings and then pass them to the sub output functions and THEN perform log_setting checks and debug_level checks. 
I performed a unit test of 1,000,000 log writes, there is hardly any difference.

#::: Before Checks
[01-25-2015 :: 03:15:35] [999999] Test #2... Took 17.940001 seconds

#::: With Checks
[01-25-2015 :: 04:10:55] [999999] Test #2... Took 18.018000 seconds
 2015-01-25 04:24:05 -06:00
Akkadius
5e107a9936 Help Travis figure out what time of day it is 2015-01-25 02:23:05 -06:00
Akkadius
1d462bfd0f Revert some entity related CastTo changes 2015-01-25 01:42:46 -06:00
Akkadius
13af3e35e2 Removed COMMANDS_LOGGING ifdef 2015-01-24 22:48:06 -06:00