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
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
Uleat
cc1d7d54c2
Implemented mob equipment light sources
2015-01-24 22:00:06 -05:00
KimLS
17af9e3808
Merge fixes, hopefully didn't break anything.
2015-01-23 13:36:27 -08:00
KimLS
269d56e1d0
Switched out our kinda juryrigged vector types for glm::vec types since we use that as a 3d math library already but never switched out the types
2015-01-23 00:01:10 -08:00
Michael Cook (mackal)
f702e953e7
Some std::abs usage and a bit of clang-formatting
2015-01-22 22:59:52 -05:00
Akkadius
c5447778a6
Merge remote-tracking branch 'remotes/origin/master' into logging_changes
...
Conflicts:
world/client.cpp
world/worlddb.cpp
zone/aggro.cpp
zone/bot.cpp
zone/client.cpp
zone/client_packet.cpp
zone/client_process.cpp
zone/doors.cpp
zone/entity.cpp
zone/inventory.cpp
zone/mob_ai.cpp
zone/perl_client.cpp
zone/spells.cpp
zone/waypoints.cpp
zone/zone.cpp
zone/zonedb.cpp
zone/zoning.cpp
2015-01-21 17:29:30 -06:00
Akkadius
ce517f3bdc
Remove commented printf : Spawned Merc with ID %i\n
2015-01-20 01:33:31 -06:00
Uleat
e70e443950
Implemented 'enum class ClientVersion' -- added 'RoF2' to lua client version enumeration
2015-01-19 23:32:57 -05:00
Trevius
96820c4a31
Some work on RoF Guild Banks (still not functional).
2015-01-18 23:04:21 -06:00
Arthur Ice
ae4e1ef0d0
Removed a usage of Mob::DistNoRootNoZ and used ComparativeDistanceNoZ instead
2015-01-18 03:44:08 -08:00
Arthur Ice
8a1e03ced4
Removed a usage of Mob::DistNoRootNoZ and used ComparativeDistanceNoZ instead
2015-01-18 03:37:26 -08:00
Arthur Ice
dc275b3b1e
Removed a usage of Mob::DistNoRootNoZ and used ComparativeDistanceNoZ instead
2015-01-18 03:35:20 -08:00
Arthur Ice
517c084657
Removed a usage of Mob::DistNoRootNoZ and used ComparativeDistanceNoZ instead
2015-01-18 03:32:28 -08:00
Arthur Ice
99783fd871
Removed a usage of Mob::DistNoRootNoZ and used ComparativeDistanceNoZ instead
2015-01-18 03:31:07 -08:00
Arthur Ice
69a6a6f3f8
Removed a usage of Mob::DistNoRootNoZ and used ComparativeDistanceNoZ instead
2015-01-18 03:25:54 -08:00
Arthur Ice
90e011ad99
Removed a usage of Mob::DistNoRootNoZ and used ComparativeDistanceNoZ instead
2015-01-18 03:24:40 -08:00
Akkadius
467b359d0c
Moved all EQEmuLogSys:: enum references used in Log.Out to a namespace 'Logs' for shortening of syntax
2015-01-18 02:20:16 -06:00
Akkadius
c025765283
Renamed DoLog to Out as the aggregate logging function for simplicity of use and shortened syntax of Log.Out
2015-01-18 02:00:15 -06:00
Akkadius
1c048cb1d1
Renamed DebugCategory to DoLog as the aggregate logging function for simplicity of use and shortened syntax of Log.DoLog
2015-01-18 01:54:09 -06:00
Arthur Ice
0088d353d3
Removed a usage of Mob::DistNoRoot and used ComparativeDistance instead
2015-01-17 23:31:57 -08:00
Akkadius
e691735a2d
Consolidate 'LogType' Error logs over to 'LogCategory'
2015-01-18 01:30:25 -06:00
Arthur Ice
1bb4ff2d6a
Removed a usage of Mob::DistNoRoot and used ComparativeDistance instead
2015-01-17 23:30:18 -08:00
Arthur Ice
9aa46a9af2
Removed a usage of Mob::DistNoRoot and used ComparativeDistance instead
2015-01-17 23:27:57 -08:00
Arthur Ice
c5f38ee700
Removed a usage of Mob::DistNoRoot and used ComparativeDistance instead
2015-01-17 23:26:22 -08:00
Arthur Ice
81f36675b3
Removed a usage of Mob::DistNoRoot and used ComparativeDistance instead
2015-01-17 23:19:56 -08:00
Akkadius
7dbde36b03
Rename reference logger to Log
2015-01-18 00:41:18 -06:00
Akkadius
58d0b86a67
Consolidate EQEmuLogsys::Debug General calls into DebugCategory
2015-01-18 00:00:03 -06:00
Akkadius
d4f2e0ce5f
port mlog 'AI' category to new log system
2015-01-17 02:20:01 -06:00
Akkadius
7e7c59967c
_log error convert to logger.Log(EQEmuLogSys::Error
2015-01-10 19:05:46 -06:00
Akkadius
b76e179d75
Fix spacing
2015-01-10 15:47:36 -06:00
Akkadius
6844645dfb
Replace LogFile->write(EQEmuLog::Error, with logger.logevents(EQEmuLogSys::Error
2015-01-10 15:44:35 -06:00
Akkadius
dadae1a71f
Replaced Debug messages: LogFile->write with logger.LogDebug
2015-01-10 15:26:38 -06:00
Arthur Ice
cd9ca65587
merge upstream
2015-01-08 19:40:00 -08:00
Akkadius
be381b4e56
Renamed EQEMuLog class to EQEmuLog
2015-01-08 19:46:28 -06:00
Akkadius
3a488e3a61
Changed hate counter to uint32 to prevent negative rollback, this most likely can will be an issue but more uncommon
...
Renamed and refactored most functions and variables in hate_list.h/cpp for readability
Refactored how hate works in some local functions mixing the use of hate variable and split it out into different status variables
hate_list.cpp/.h style cleanup
hate_list.h header function sort, comment erase
functions should clearly state their function
2014-12-27 18:24:42 -06:00
Michael Cook (mackal)
8522542ae2
Use lambdas in sort functions (for zone at least)
2014-12-24 18:29:23 -05:00
Arthur Ice
f409d39f1a
merge upstream
2014-12-21 13:57:20 -08:00
Akkadius
782b6fee94
merc.cpp header include cleanup
2014-12-15 17:54:23 -06:00
Michael Cook (mackal)
820f99067d
Make use of the targetable_with_hotkey flag for SoF+
2014-12-10 01:19:44 -05:00
Trevius
37951d09c7
(RoF+) Implemented Hero's Forge Armor Models for Items. To use, set herosforgemodel field in the item table to a model number such as 63 (for example).
2014-12-09 21:18:56 -06:00
KayenEQ
70f570dbd9
Implemented support for allowing most focus effects to now be usable
...
by NPCs (ie Heal/Damage focus, cast time, spell range ect) from
both spell buffs and items.
Rule for enabling spell focus is TRUE by default
Rule for enabling item focus is FALSE by default.
Consilidated a number of redundant client / mob functions
to use the same pathway for calculating effect values.
2014-12-08 01:22:01 -05:00
Arthur Ice
2aa287fe3c
Merge
2014-12-05 20:16:13 -08:00
Michael Cook (mackal)
23698c1373
Merge branch 'master' into random
2014-12-02 14:39:00 -05:00
Michael Cook (mackal)
dc0eb0f6b5
Merge branch 'master' into random
...
Conflicts:
zone/command.cpp
zone/merc.cpp
2014-12-02 14:05:55 -05:00
Trevius
52eb4d2d4e
Fixed Mercenary Depop Crash in Windows.
2014-12-02 00:07:09 -06:00
Trevius
24ea7a0d45
Mercenaries now spawn as the same Gender and Size of the Merchant they are purchased from.
...
Mercenaries now spawn with randomized facial features when purchased.
Setting a lastname for NPCs will now override any hard coded lastname (such as GM Trainers).
2014-12-01 19:54:01 -06:00
Michael Cook (mackal)
395be050a3
Switch random function to std::mt19937
...
Added class EQEmu::Random
Functions:
EQEmu::Random::Int(int low, int high)
EQEmu::Random::Real(double low, double high)
EQEmu::Random::Roll(int required)
EQEmu::Random::Roll(double required)
EQEmu::Random::Reseed()
For zone, you will access the random object through the zone object
ex.
zone->random.Int(0, 100);
Int returns a random int between low and high
Real returns a random double between low and high
Roll(int) returns true if Int(0, 99) < required is true
Roll(double) returns true if Real(0.0, 1.0) <= required is true
2014-12-01 18:13:12 -05:00
Arthur Ice
54bc1b06e4
NPC constructor converted to use xyz_heading
2014-11-30 17:32:11 -08:00
